Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted Math.h.in for const vtkm::Float32 function inputs

Browse Source
This commit is contained in:
Thomas J. Otahal 2017-02-06 12:18:13 -07:00
parent 7d6601d794
commit 71b2348dd9
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vtkm/Math.h
View File

@ -99,21 +99,22 @@ vtkm::Float64 Pi_4()
}
namespace detail {
template<typename T>
struct FloatingPointReturnCondition :
std::enable_if<std::is_same<typename vtkm::VecTraits<T>::ComponentType, vtkm::Float32>::value ||
std::is_same<typename vtkm::VecTraits<T>::ComponentType, const vtkm::Float32>::value>
{
};
template<typename T, typename = void>
struct FloatingPointReturnType
{
typedef vtkm::Float64 Type;
};
template<>
struct FloatingPointReturnType<vtkm::Float32>
{
typedef vtkm::Float32 Type;
};
template<vtkm::IdComponent N>
struct FloatingPointReturnType<Vec<vtkm::Float32,N> >
template<typename T>
struct FloatingPointReturnType<T, typename FloatingPointReturnCondition<T>::type>
{
typedef vtkm::Float32 Type;
};

19
vtkm/Math.h.in
View File

@ -242,21 +242,22 @@ vtkm::Float64 Pi_4()
}
namespace detail {
template<typename T>
struct FloatingPointReturnCondition :
std::enable_if<std::is_same<typename vtkm::VecTraits<T>::ComponentType, vtkm::Float32>::value ||
std::is_same<typename vtkm::VecTraits<T>::ComponentType, const vtkm::Float32>::value>
{
};
template<typename T, typename = void>
struct FloatingPointReturnType
{
typedef vtkm::Float64 Type;
};
template<>
struct FloatingPointReturnType<vtkm::Float32>
{
typedef vtkm::Float32 Type;
};
template<vtkm::IdComponent N>
struct FloatingPointReturnType<Vec<vtkm::Float32,N> >
template<typename T>
struct FloatingPointReturnType<T, typename FloatingPointReturnCondition<T>::type>
{
typedef vtkm::Float32 Type;
};