compiler warnings, etc.

This commit is contained in:
Dave Pugmire 2019-10-09 15:28:42 -04:00
parent d2cdbd66c0
commit 3be90354ff
3 changed files with 11 additions and 11 deletions

@ -48,11 +48,11 @@ public:
VTKM_EXEC_CONT bool CheckTookAnySteps() const { return this->test(TOOK_ANY_STEPS_BIT); }
private:
static constexpr vtkm::IdComponent SUCCESS_BIT = 0;
static constexpr vtkm::IdComponent TERMINATE_BIT = 1;
static constexpr vtkm::IdComponent SPATIAL_BOUNDS_BIT = 2;
static constexpr vtkm::IdComponent TEMPORAL_BOUNDS_BIT = 3;
static constexpr vtkm::IdComponent TOOK_ANY_STEPS_BIT = 4;
static constexpr vtkm::Id SUCCESS_BIT = 0;
static constexpr vtkm::Id TERMINATE_BIT = 1;
static constexpr vtkm::Id SPATIAL_BOUNDS_BIT = 2;
static constexpr vtkm::Id TEMPORAL_BOUNDS_BIT = 3;
static constexpr vtkm::Id TOOK_ANY_STEPS_BIT = 4;
};
inline VTKM_EXEC_CONT std::ostream& operator<<(std::ostream& s, const vtkm::ParticleStatus& status)

@ -55,9 +55,9 @@ public:
VTKM_EXEC_CONT bool CheckTemporalBounds() const { return this->test(TEMPORAL_BOUNDS_BIT); }
private:
static constexpr vtkm::IdComponent SUCCESS_BIT = 0;
static constexpr vtkm::IdComponent SPATIAL_BOUNDS_BIT = 1;
static constexpr vtkm::IdComponent TEMPORAL_BOUNDS_BIT = 2;
static constexpr vtkm::Id SUCCESS_BIT = 0;
static constexpr vtkm::Id SPATIAL_BOUNDS_BIT = 1;
static constexpr vtkm::Id TEMPORAL_BOUNDS_BIT = 2;
};
template <typename DeviceAdapter, typename FieldArrayType>

@ -66,9 +66,9 @@ public:
VTKM_EXEC_CONT bool CheckTemporalBounds() const { return this->test(TEMPORAL_BOUNDS_BIT); }
private:
static constexpr vtkm::IdComponent SUCCESS_BIT = 0;
static constexpr vtkm::IdComponent SPATIAL_BOUNDS_BIT = 1;
static constexpr vtkm::IdComponent TEMPORAL_BOUNDS_BIT = 2;
static constexpr vtkm::Id SUCCESS_BIT = 0;
static constexpr vtkm::Id SPATIAL_BOUNDS_BIT = 1;
static constexpr vtkm::Id TEMPORAL_BOUNDS_BIT = 2;
};
inline VTKM_EXEC_CONT std::ostream& operator<<(std::ostream& s, const IntegratorStatus& status)