Merge topic 'doxygen_tweaks'

98f8c2e0 Doxygen now excludes the thrust policy namespace.
cb4cae86 Cleanup the aligned allocator doxygen.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !834
This commit is contained in:
Robert Maynard 2017-07-12 12:53:58 +00:00 committed by Kitware Robot
commit 3a71c58e4f
2 changed files with 2 additions and 0 deletions

@ -150,6 +150,7 @@ FILE_PATTERNS = *.cxx *.h *.cu
RECURSIVE = YES
EXCLUDE = @VTKm_SOURCE_DIR@/vtkm/testing/OptionParser.h
EXCLUDE += @VTKm_SOURCE_DIR@/vtkm/exec/cuda/internal/ExecutionPolicy.h
EXCLUDE_SYMLINKS = NO

@ -52,6 +52,7 @@ void* alloc_aligned(size_t size, size_t align);
VTKM_CONT_EXPORT
void free_aligned(void* mem);
/// \brief an aligned allocator
/// A simple aligned allocator type that will align allocations to `Alignment` bytes
/// TODO: Once C++11 std::allocator_traits is better used by STL and we want to drop
/// support for pre-C++11 we can drop a lot of the typedefs and functions here.