Commit d3d06ecd authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot
Browse files

Merge topic 'correct_warnings_found_with_cuda_9'

e3eca82c This host/device integrator constructors need to suppress warnings
181b955f

 ConvertToRGB with Vec<uint,3> was missing VTKM_EXEC markup.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti's avatarAllison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1240
parents 056e63d3 e3eca82c
......@@ -57,7 +57,7 @@ struct ConvertToRGB : public vtkm::worklet::WorkletMapField
colorconversion::ColorToUChar(in[2]));
}
vtkm::Vec<vtkm::UInt8, 3> operator()(const vtkm::Vec<vtkm::UInt8, 3>& in) const
VTKM_EXEC vtkm::Vec<vtkm::UInt8, 3> operator()(const vtkm::Vec<vtkm::UInt8, 3>& in) const
{ //vtkScalarsToColorsRGBToRGB
return in;
}
......
......@@ -40,6 +40,7 @@ template <typename FieldEvaluateType,
class Integrator
{
protected:
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
Integrator()
: StepLength(0)
......@@ -173,6 +174,7 @@ template <typename FieldEvaluateType, typename FieldType>
class RK4Integrator : public Integrator<FieldEvaluateType, FieldType, RK4Integrator>
{
public:
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
RK4Integrator()
: Integrator<FieldEvaluateType, FieldType, vtkm::worklet::particleadvection::RK4Integrator>()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment