Move Pairwise Add to vtkm namespace

This commit is contained in:
Chun-Ming Chen 2015-06-08 12:09:53 -04:00
parent c7cf1a27f2
commit 19a736fd05

@ -131,6 +131,16 @@ struct Pair
}
};
/// Pairwise Add.
/// This is done by adding the two objects separately.
/// Useful for Reduce operation on a zipped array
template<typename T, typename U>
VTKM_EXEC_CONT_EXPORT
vtkm::Pair<T, U> operator+(const vtkm::Pair<T, U>& a, const vtkm::Pair<T, U> &b)
{
return vtkm::Pair<T,U>(a.first + b.first, a.second + b.second);
}
template <typename T1, typename T2>
VTKM_EXEC_CONT_EXPORT
vtkm::Pair<T1,T2> make_Pair(const T1 &firstSrc, const T2 &secondSrc)
@ -140,11 +150,4 @@ vtkm::Pair<T1,T2> make_Pair(const T1 &firstSrc, const T2 &secondSrc)
} // namespace vtkm
template<typename T, typename U>
vtkm::Pair<T, U> operator+(const vtkm::Pair<T, U>& a, const vtkm::Pair<T, U> &b)
{
return vtkm::Pair<T,U>(a.first + b.first, a.second + b.second);
}
#endif //vtk_m_Pair_h