Commit 6e3ae4ba authored by Sebastien Jourdain's avatar Sebastien Jourdain Committed by Kitware Robot

Merge topic 'fix-htg-warnings2'

f29e0cc5 More HTG warning fix
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti's avatarAllison Vacanti <allison.vacanti@kitware.com>
Merge-request: !4993
parents f5e822c2 f29e0cc5
......@@ -178,7 +178,7 @@ public:
vtkIdType GetElderChildIndex( unsigned int idx_parent ) const override
{
assert( "pre: valid_range" &&
idx_parent < this->Datas->NumberOfVertices );
idx_parent < static_cast<unsigned int>(this->Datas->NumberOfVertices) );
return this->CompactDatas->ParentToElderChild_stl[idx_parent];
}
......
......@@ -183,8 +183,11 @@ public:
/**
* Getter for origin coordinates of the current cell.
*/
double* GetOrigin() const {
return (double*)this->Origin;
double* GetOrigin() {
return this->Origin;
}
const double* GetOrigin() const {
return this->Origin;
}
/**
......
......@@ -212,7 +212,8 @@ public:
/**
* Getter for origin coordinates of the current cell.
*/
double* GetOrigin() const { return (double*)this->Origin; }
double* GetOrigin() { return this->Origin; }
const double* GetOrigin() const { return this->Origin; }
/**
* Getter for bounding box of the current cell.
......
......@@ -152,7 +152,7 @@ void vtkHyperTreeGridOrientedGeometryCursor::SetGlobalIndexFromLocal( vtkIdType
//-----------------------------------------------------------------------------
double* vtkHyperTreeGridOrientedGeometryCursor::GetOrigin( )
{
return (double*)this->Entry.GetOrigin();
return this->Entry.GetOrigin();
}
//-----------------------------------------------------------------------------
......
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