Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

compiler warnings.

Browse Source
This commit is contained in:
Dave Pugmire 2019-10-10 08:43:39 -04:00
parent 02b0fd51e4
commit 4a7129db01
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/Particle.h
View File

@ -55,7 +55,7 @@ private:
static constexpr vtkm::Id TOOK_ANY_STEPS_BIT = 4;
};
inline VTKM_EXEC_CONT std::ostream& operator<<(std::ostream& s, const vtkm::ParticleStatus& status)
inline VTKM_CONT std::ostream& operator<<(std::ostream& s, const vtkm::ParticleStatus& status)
{
s << "[" << status.CheckOk() << " " << status.CheckTerminate() << " "
<< status.CheckSpatialBounds() << " " << status.CheckTemporalBounds() << "]";

6
vtkm/worklet/particleadvection/Integrators.h
View File

@ -34,7 +34,7 @@ namespace worklet
namespace particleadvection
{
class VTKM_ALWAYS_EXPORT IntegratorStatus : public vtkm::Bitset<vtkm::UInt8>
class IntegratorStatus : public vtkm::Bitset<vtkm::UInt8>
{
public:
VTKM_EXEC_CONT IntegratorStatus() {}
@ -71,7 +71,7 @@ private:
static constexpr vtkm::Id TEMPORAL_BOUNDS_BIT = 2;
};
inline VTKM_EXEC_CONT std::ostream& operator<<(std::ostream& s, const IntegratorStatus& status)
inline VTKM_CONT std::ostream& operator<<(std::ostream& s, const IntegratorStatus& status)
{
s << "[" << status.CheckOk() << " " << status.CheckSpatialBounds() << " "
<< status.CheckTemporalBounds() << "]";
@ -161,11 +161,13 @@ protected:
IntegratorStatus status;
if (!this->Evaluator.IsWithinSpatialBoundary(inpos))
{
status.SetFail();
status.SetSpatialBounds();
return status;
}
if (!this->Evaluator.IsWithinTemporalBoundary(time))
{
status.SetFail();
status.SetTemporalBounds();
return status;
}