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 'suppress-macro-location'

Browse Source 
db36ee22 cont: move VTKM_SUPPRESS_EXEC_WARNINGS to above declarations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !775
This commit is contained in:
Robert Maynard 2017-05-24 12:10:31 +00:00 committed by Kitware Robot
commit b6993a7650
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/cont/ArrayHandlePermutation.h
View File

@ -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)

4
vtkm/cont/ArrayHandleTransform.h
View File

@ -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())

4
vtkm/cont/ArrayPortalToIterators.h
View File

@ -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)

8
vtkm/cont/tbb/internal/FunctorsTBB.h
View File

@ -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)