Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'indent-generated'

Browse Source 
b03a61da Make .in files match new formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !784
This commit is contained in:
Kenneth Moreland 2017-05-28 14:28:37 +00:00 committed by Kitware Robot
commit 071c792148
3 changed files with 307 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtkm/Math.h
View File

@ -108,7 +108,7 @@ struct FloatingPointReturnType<T, typename FloatingPointReturnCondition<T>::type
{
typedef vtkm::Float32 Type;
};
}
} // namespace detail
/// Compute the sine of \p x.
///
@ -1361,18 +1361,15 @@ static inline VTKM_EXEC_CONT vtkm::Float64 Exp10(T x)
static inline VTKM_EXEC_CONT vtkm::Float32 Exp10(vtkm::Float32 x)
{
return vtkm::Pow(10, x);
;
}
static inline VTKM_EXEC_CONT vtkm::Float64 Exp10(vtkm::Float64 x)
{
return vtkm::Pow(10, x);
;
}
template <typename T>
static inline VTKM_EXEC_CONT vtkm::Float64 Exp10(T x)
{
return vtkm::Pow(10, static_cast<vtkm::Float64>(x));
;
}
#endif // !VTKM_CUDA

632
vtkm/Math.h.in
View File

File diff suppressed because it is too large Load Diff

4
vtkm/exec/internal/WorkletInvokeFunctorDetail.h.in
View File

@ -40,8 +40,8 @@ $# Ignore the following comment. It is meant for the generated file.
#ifndef vtk_m_exec_internal_WorkletInvokeFunctorDetail_h
#define vtk_m_exec_internal_WorkletInvokeFunctorDetail_h
#if !defined(vtk_m_exec_internal_TaskSingular_h) && \
!defined(vtk_m_exec_internal_TaskTiling_h) && \
#if !defined(vtk_m_exec_internal_TaskSingular_h) && \\
!defined(vtk_m_exec_internal_TaskTiling_h) && \\
!defined(VTKM_TEST_HEADER_BUILD)
#error WorkletInvokeFunctorDetail.h must be included from TaskSingular.h or TaskTiling.h
#endif