mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-16 17:22:55 +00:00
cont: move VTKM_SUPPRESS_EXEC_WARNINGS to above declarations
Most uses of this macro appeared before any associated `template` lines. Make them consistent. This also makes clang-format happier.
This commit is contained in:
parent
40a0b5dcce
commit
db36ee22b0
@ -53,8 +53,8 @@ public:
|
||||
/// do any type casting that the delegate portals do (like the non-const to
|
||||
/// const cast).
|
||||
///
|
||||
template<typename OtherIP, typename OtherVP>
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
template<typename OtherIP, typename OtherVP>
|
||||
VTKM_EXEC_CONT
|
||||
ArrayPortalPermutation(
|
||||
const ArrayPortalPermutation<OtherIP,OtherVP> &src)
|
||||
|
@ -68,8 +68,8 @@ public:
|
||||
/// type that can be copied to this iterator type. This allows us to do any
|
||||
/// type casting that the iterators do (like the non-const to const cast).
|
||||
///
|
||||
template<class OtherV, class OtherP, class OtherF>
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
template<class OtherV, class OtherP, class OtherF>
|
||||
VTKM_EXEC_CONT
|
||||
ArrayPortalTransform(const ArrayPortalTransform<OtherV,OtherP,OtherF> &src)
|
||||
: Portal(src.GetPortal()),
|
||||
@ -130,8 +130,8 @@ public:
|
||||
: Superclass(portal,functor), InverseFunctor(inverseFunctor)
|
||||
{ }
|
||||
|
||||
template<class OtherV, class OtherP, class OtherF, class OtherInvF>
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
template<class OtherV, class OtherP, class OtherF, class OtherInvF>
|
||||
VTKM_EXEC_CONT
|
||||
ArrayPortalTransform(const ArrayPortalTransform<OtherV,OtherP,OtherF,OtherInvF> &src)
|
||||
: Superclass(src), InverseFunctor(src.GetInverseFunctor())
|
||||
|
@ -77,8 +77,8 @@ private:
|
||||
|
||||
/// Convienience function for converting an ArrayPortal to a begin iterator.
|
||||
///
|
||||
template<typename PortalType>
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
template<typename PortalType>
|
||||
VTKM_EXEC_CONT
|
||||
typename vtkm::cont::ArrayPortalToIterators<PortalType>::IteratorType
|
||||
ArrayPortalToIteratorBegin(const PortalType &portal)
|
||||
@ -89,8 +89,8 @@ ArrayPortalToIteratorBegin(const PortalType &portal)
|
||||
|
||||
/// Convienience function for converting an ArrayPortal to an end iterator.
|
||||
///
|
||||
template<typename PortalType>
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
template<typename PortalType>
|
||||
VTKM_EXEC_CONT
|
||||
typename vtkm::cont::ArrayPortalToIterators<PortalType>::IteratorType
|
||||
ArrayPortalToIteratorEnd(const PortalType &portal)
|
||||
|
@ -155,8 +155,8 @@ struct ReduceBody
|
||||
}
|
||||
};
|
||||
|
||||
template<class InputPortalType, typename T, class BinaryOperationType>
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
template<class InputPortalType, typename T, class BinaryOperationType>
|
||||
VTKM_CONT static
|
||||
T ReducePortals(InputPortalType inputPortal,
|
||||
T initialValue,
|
||||
@ -399,9 +399,9 @@ struct ScanExclusiveBody
|
||||
}
|
||||
};
|
||||
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
template<class InputPortalType, class OutputPortalType,
|
||||
class BinaryOperationType>
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
VTKM_CONT static
|
||||
typename std::remove_reference<typename OutputPortalType::ValueType>::type
|
||||
ScanInclusivePortals(InputPortalType inputPortal,
|
||||
@ -424,9 +424,9 @@ ScanInclusivePortals(InputPortalType inputPortal,
|
||||
return body.Sum;
|
||||
}
|
||||
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
template<class InputPortalType, class OutputPortalType,
|
||||
class BinaryOperationType>
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
VTKM_CONT static
|
||||
typename std::remove_reference<typename OutputPortalType::ValueType>::type
|
||||
ScanExclusivePortals(InputPortalType inputPortal,
|
||||
@ -609,10 +609,10 @@ private:
|
||||
vtkm::exec::internal::ErrorMessageBuffer ErrorMessage;
|
||||
};
|
||||
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
template<typename InputPortalType,
|
||||
typename IndexPortalType,
|
||||
typename OutputPortalType>
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
VTKM_CONT static void ScatterPortal(InputPortalType inputPortal,
|
||||
IndexPortalType indexPortal,
|
||||
OutputPortalType outputPortal)
|
||||
|
Loading…
Reference in New Issue
Block a user