Fix visual studio error.

This commit is contained in:
Mark Kim 2019-06-21 20:51:44 -04:00
parent fc479aa02c
commit b9448131d5
2 changed files with 19 additions and 19 deletions

@ -19,7 +19,7 @@ namespace vtkm
namespace cont
{
VTKM_CONT CellSetExtrude::CellSetExtrude(const std::string& name)
CellSetExtrude::CellSetExtrude(const std::string& name)
: vtkm::cont::CellSet(name)
, IsPeriodic(false)
, NumberOfPointsPerPlane(0)
@ -29,12 +29,12 @@ VTKM_CONT CellSetExtrude::CellSetExtrude(const std::string& name)
{
}
VTKM_CONT CellSetExtrude::CellSetExtrude(const vtkm::cont::ArrayHandle<vtkm::Int32>& conn,
vtkm::Int32 numberOfPointsPerPlane,
vtkm::Int32 numberOfPlanes,
const vtkm::cont::ArrayHandle<vtkm::Int32>& nextNode,
bool periodic,
const std::string& name)
CellSetExtrude::CellSetExtrude(const vtkm::cont::ArrayHandle<vtkm::Int32>& conn,
vtkm::Int32 numberOfPointsPerPlane,
vtkm::Int32 numberOfPlanes,
const vtkm::cont::ArrayHandle<vtkm::Int32>& nextNode,
bool periodic,
const std::string& name)
: vtkm::cont::CellSet(name)
, IsPeriodic(periodic)
, NumberOfPointsPerPlane(numberOfPointsPerPlane)
@ -147,7 +147,7 @@ void CellSetExtrude::ReleaseResourcesExecution()
this->PrevNode.ReleaseResourcesExecution();
}
VTKM_CONT vtkm::Id2 CellSetExtrude::GetSchedulingRange(vtkm::TopologyElementTagCell) const
vtkm::Id2 CellSetExtrude::GetSchedulingRange(vtkm::TopologyElementTagCell) const
{
if (this->IsPeriodic)
{
@ -159,7 +159,7 @@ VTKM_CONT vtkm::Id2 CellSetExtrude::GetSchedulingRange(vtkm::TopologyElementTagC
}
}
VTKM_CONT vtkm::Id2 CellSetExtrude::GetSchedulingRange(vtkm::TopologyElementTagPoint) const
vtkm::Id2 CellSetExtrude::GetSchedulingRange(vtkm::TopologyElementTagPoint) const
{
return vtkm::Id2(this->NumberOfPointsPerPlane, this->NumberOfPlanes);
}

@ -26,17 +26,17 @@ namespace vtkm
namespace cont
{
class VTKM_ALWAYS_EXPORT CellSetExtrude : public CellSet
class VTKM_CONT_EXPORT CellSetExtrude : public CellSet
{
public:
CellSetExtrude(const std::string& name = "extrude");
VTKM_CONT CellSetExtrude(const std::string& name = "extrude");
CellSetExtrude(const vtkm::cont::ArrayHandle<vtkm::Int32>& conn,
vtkm::Int32 numberOfPointsPerPlane,
vtkm::Int32 numberOfPlanes,
const vtkm::cont::ArrayHandle<vtkm::Int32>& nextNode,
bool periodic,
const std::string& name = "extrude");
VTKM_CONT CellSetExtrude(const vtkm::cont::ArrayHandle<vtkm::Int32>& conn,
vtkm::Int32 numberOfPointsPerPlane,
vtkm::Int32 numberOfPlanes,
const vtkm::cont::ArrayHandle<vtkm::Int32>& nextNode,
bool periodic,
const std::string& name = "extrude");
vtkm::Int32 GetNumberOfPlanes() const;
@ -48,9 +48,9 @@ public:
vtkm::Id GetNumberOfEdges() const override;
vtkm::Id2 GetSchedulingRange(vtkm::TopologyElementTagCell) const;
VTKM_CONT vtkm::Id2 GetSchedulingRange(vtkm::TopologyElementTagCell) const;
vtkm::Id2 GetSchedulingRange(vtkm::TopologyElementTagPoint) const;
VTKM_CONT vtkm::Id2 GetSchedulingRange(vtkm::TopologyElementTagPoint) const;
vtkm::UInt8 GetCellShape(vtkm::Id id) const override;
vtkm::IdComponent GetNumberOfPointsInCell(vtkm::Id id) const override;