Commit 4b98b16b authored by Kenneth Moreland's avatar Kenneth Moreland Committed by Kitware Robot
Browse files

Merge topic 'math-h-clang-formatting'

90dd8a0e

 Correct clang formatting in Math.h.in
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !1654
parents bd544754 90dd8a0e
...@@ -42,14 +42,13 @@ $# Ignore the following comment. It is meant for the generated file. ...@@ -42,14 +42,13 @@ $# Ignore the following comment. It is meant for the generated file.
#endif #endif
#ifdef VTKM_MSVC #ifdef VTKM_MSVC
#include <intrin.h> // For bitwise intrinsics (__popcnt, etc) #include <intrin.h> // For bitwise intrinsics (__popcnt, etc)
#include <vtkm/internal/Windows.h> // for types used by MSVC intrinsics. #include <vtkm/internal/Windows.h> // for types used by MSVC intrinsics.
#ifndef VTKM_CUDA #ifndef VTKM_CUDA
#include <math.h> #include <math.h>
#endif // VTKM_CUDA #endif // VTKM_CUDA
#endif // VTKM_MSVC #endif // VTKM_MSVC
#define VTKM_CUDA_MATH_FUNCTION_32(func) func##f #define VTKM_CUDA_MATH_FUNCTION_32(func) func##f
#define VTKM_CUDA_MATH_FUNCTION_64(func) func #define VTKM_CUDA_MATH_FUNCTION_64(func) func
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment