Commit 7bde07c6 authored by Robert Maynard's avatar Robert Maynard
Browse files

Update Accelerators/Vtkm to not produce any cpp check warnings

parent 63296a87
......@@ -42,9 +42,15 @@ class VTKACCELERATORSVTKM_EXPORT vtkmCellSetExplicitAOS : public CellSet
{
public:
vtkmCellSetExplicitAOS(const std::string& name = std::string())
: CellSet(name), Shapes(), Connectivity(), IndexOffsets(),
ReverseConnectivityBuilt(false),RConn(), RNumIndices(), RIndexOffsets(),
NumberOfPoints(0)
: CellSet(name)
, Shapes()
, Connectivity()
, IndexOffsets()
, ReverseConnectivityBuilt(false)
, RConn()
, RNumIndices()
, RIndexOffsets()
, NumberOfPoints(0)
{
}
......@@ -52,6 +58,19 @@ public:
{
}
vtkmCellSetExplicitAOS(const vtkmCellSetExplicitAOS& src)
: CellSet(src)
, Shapes(src.Shapes)
, Connectivity(src.Connectivity)
, IndexOffsets(src.IndexOffsets)
, ReverseConnectivityBuilt(src.ReverseConnectivityBuilt)
, RConn(src.RConn)
, RNumIndices(src.RNumIndices)
, RIndexOffsets(src.RIndexOffsets)
, NumberOfPoints(src.NumberOfPoints)
{
}
vtkmCellSetExplicitAOS& operator=(const vtkmCellSetExplicitAOS& src)
{
this->CellSet::operator=(src);
......
......@@ -47,29 +47,42 @@ class VTKACCELERATORSVTKM_EXPORT vtkmCellSetSingleType : public CellSet
public:
vtkmCellSetSingleType()
: CellSet((std::string())),
NumberOfCells(0),
NumberOfPoints(0),
CellTypeAsId(CellShapeTagEmpty::Id),
Connectivity(),
ReverseConnectivityBuilt(false),
RConn(),
RNumIndices(),
RIndexOffsets()
: CellSet((std::string()))
, NumberOfCells(0)
, NumberOfPoints(0)
, CellTypeAsId(CellShapeTagEmpty::Id)
, Connectivity()
, ReverseConnectivityBuilt(false)
, RConn()
, RNumIndices()
, RIndexOffsets()
{
}
template <typename CellShapeTag>
vtkmCellSetSingleType(CellShapeTag, const std::string& name)
: CellSet(name),
NumberOfCells(0),
NumberOfPoints(0),
CellTypeAsId(CellShapeTag::Id),
Connectivity(),
ReverseConnectivityBuilt(false),
RConn(),
RNumIndices(),
RIndexOffsets()
: CellSet(name)
, NumberOfCells(0)
, NumberOfPoints(0)
, CellTypeAsId(CellShapeTag::Id)
, Connectivity()
, ReverseConnectivityBuilt(false)
, RConn()
, RNumIndices()
, RIndexOffsets()
{
}
vtkmCellSetSingleType(const vtkmCellSetSingleType& src)
: CellSet(src)
, NumberOfCells(src.NumberOfCells)
, NumberOfPoints(src.NumberOfPoints)
, CellTypeAsId(src.CellTypeAsId)
, Connectivity(src.Connectivity)
, ReverseConnectivityBuilt(src.ReverseConnectivityBuilt)
, RConn(src.RConn)
, RNumIndices(src.RNumIndices)
, RIndexOffsets(src.RIndexOffsets)
{
}
......
......@@ -51,9 +51,9 @@ public:
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC
ValueType Get(vtkm::Id index) const;
inline ValueType Get(vtkm::Id index) const;
void Set(vtkm::Id index, const ValueType& value) const;
inline void Set(vtkm::Id index, const ValueType& value) const;
typedef vtkm::cont::internal::IteratorFromArrayPortal<vtkArrayPortal>
IteratorType;
......@@ -90,13 +90,6 @@ public:
vtkPointsPortal(vtkPoints* points, vtkm::Id size);
/// Copy constructor for any other vtkArrayPortal with an iterator
/// 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 <typename OtherType>
vtkPointsPortal(const vtkPointsPortal<OtherType>& src);
vtkm::Id GetNumberOfValues() const
{
return this->Size;
......@@ -104,9 +97,9 @@ public:
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC
ValueType Get(vtkm::Id index) const;
inline ValueType Get(vtkm::Id index) const;
void Set(vtkm::Id index, const ValueType& value) const;
inline void Set(vtkm::Id index, const ValueType& value) const;
typedef vtkm::cont::internal::IteratorFromArrayPortal<vtkPointsPortal>
IteratorType;
......
......@@ -111,20 +111,6 @@ vtkPointsPortal<Type>::vtkPointsPortal(vtkPoints* points, vtkm::Id size)
VTKM_ASSERT(this->GetNumberOfValues() >= 0);
}
//------------------------------------------------------------------------------
/// Copy constructor for any other vtkArrayPortal with an iterator
/// 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 <typename Type>
template <typename OtherType>
vtkPointsPortal<Type>::vtkPointsPortal(const vtkPointsPortal<OtherType>& src)
: Points(src.GetVtkData()),
Array(static_cast<ComponentType*>(src.GetVtkData()->GetVoidPointer(0))),
Size(src.GetNumberOfValues())
{
}
//------------------------------------------------------------------------------
template <typename Type>
typename vtkPointsPortal<Type>::ValueType
......
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