Commit 53aaf26e authored by Eric Stanton's avatar Eric Stanton
Browse files

BUG: Attempt to fix compiler errors on HP platform

parent aa1fc6b6
...@@ -668,7 +668,7 @@ private: ...@@ -668,7 +668,7 @@ private:
}; };
vtkStandardNewMacro(vtkExodusIIXMLParser); vtkStandardNewMacro(vtkExodusIIXMLParser);
vtkCxxRevisionMacro(vtkExodusIIXMLParser,"1.25"); vtkCxxRevisionMacro(vtkExodusIIXMLParser,"1.26");
...@@ -1406,7 +1406,7 @@ void vtkExodusIIReaderPrivate::ArrayInfoType::Reset() ...@@ -1406,7 +1406,7 @@ void vtkExodusIIReaderPrivate::ArrayInfoType::Reset()
} }
// ------------------------------------------------------- PRIVATE CLASS MEMBERS // ------------------------------------------------------- PRIVATE CLASS MEMBERS
vtkCxxRevisionMacro(vtkExodusIIReaderPrivate,"1.25"); vtkCxxRevisionMacro(vtkExodusIIReaderPrivate,"1.26");
vtkStandardNewMacro(vtkExodusIIReaderPrivate); vtkStandardNewMacro(vtkExodusIIReaderPrivate);
vtkCxxSetObjectMacro(vtkExodusIIReaderPrivate,CachedConnectivity,vtkUnstructuredGrid); vtkCxxSetObjectMacro(vtkExodusIIReaderPrivate,CachedConnectivity,vtkUnstructuredGrid);
vtkCxxSetObjectMacro(vtkExodusIIReaderPrivate,Parser,vtkExodusIIXMLParser); vtkCxxSetObjectMacro(vtkExodusIIReaderPrivate,Parser,vtkExodusIIXMLParser);
...@@ -2550,7 +2550,7 @@ void vtkExodusIIReaderPrivate::InsertBlockCells( int otyp, int obj, int conn_typ ...@@ -2550,7 +2550,7 @@ void vtkExodusIIReaderPrivate::InsertBlockCells( int otyp, int obj, int conn_typ
//cout << "\n"; //cout << "\n";
//cout << " " << //cout << " " <<
cellId = output->InsertNextCell( binfo->CellType, binfo->PointsPerCell, &cellIds[0] ); cellId = output->InsertNextCell( binfo->CellType, binfo->PointsPerCell, &cellIds[0] );
this->ReverseCellMap.insert(vtkstd::pair<vtkIdType,vtkIdType>(cellId,binfo->FileOffset + i - 1)); this->ReverseCellMap.insert(vtkstd::make_pair<vtkIdType,vtkIdType>(cellId,binfo->FileOffset + i - 1));
srcIds += binfo->PointsPerCell; srcIds += binfo->PointsPerCell;
} }
//cout << "\n"; //cout << "\n";
...@@ -2571,7 +2571,7 @@ void vtkExodusIIReaderPrivate::InsertBlockCells( int otyp, int obj, int conn_typ ...@@ -2571,7 +2571,7 @@ void vtkExodusIIReaderPrivate::InsertBlockCells( int otyp, int obj, int conn_typ
} }
//cout << "\n"; //cout << "\n";
cellId = output->InsertNextCell( binfo->CellType, binfo->PointsPerCell, &cellIds[0] ); cellId = output->InsertNextCell( binfo->CellType, binfo->PointsPerCell, &cellIds[0] );
this->ReverseCellMap.insert(vtkstd::pair<vtkIdType,vtkIdType>(cellId,binfo->FileOffset + i - 1)); this->ReverseCellMap.insert(vtkstd::make_pair<vtkIdType,vtkIdType>(cellId,binfo->FileOffset + i - 1));
srcIds += binfo->PointsPerCell; srcIds += binfo->PointsPerCell;
} }
#else // VTK_USE_64BIT_IDS #else // VTK_USE_64BIT_IDS
...@@ -2580,7 +2580,7 @@ void vtkExodusIIReaderPrivate::InsertBlockCells( int otyp, int obj, int conn_typ ...@@ -2580,7 +2580,7 @@ void vtkExodusIIReaderPrivate::InsertBlockCells( int otyp, int obj, int conn_typ
for ( int i = 0; i < binfo->Size; ++i ) for ( int i = 0; i < binfo->Size; ++i )
{ {
cellId = output->InsertNextCell( binfo->CellType, binfo->PointsPerCell, srcIds ); cellId = output->InsertNextCell( binfo->CellType, binfo->PointsPerCell, srcIds );
this->ReverseCellMap.insert(vtkstd::pair<vtkIdType,vtkIdType>(cellId,binfo->FileOffset + i - 1)); this->ReverseCellMap.insert(vtkstd::make_pair<vtkIdType,vtkIdType>(cellId,binfo->FileOffset + i - 1));
srcIds += binfo->PointsPerCell; srcIds += binfo->PointsPerCell;
//for ( int k = 0; k < binfo->PointsPerCell; ++k ) //for ( int k = 0; k < binfo->PointsPerCell; ++k )
//cout << " " << srcIds[k]; //cout << " " << srcIds[k];
...@@ -2682,7 +2682,7 @@ void vtkExodusIIReaderPrivate::InsertSetNodeCopies( vtkIntArray* refs, int otyp, ...@@ -2682,7 +2682,7 @@ void vtkExodusIIReaderPrivate::InsertSetNodeCopies( vtkIntArray* refs, int otyp,
if ( *x < 0 ) if ( *x < 0 )
{ {
*x = this->NextSqueezePoint++; *x = this->NextSqueezePoint++;
this->ReversePointMap.insert(vtkstd::pair<vtkIdType,vtkIdType>(*x,tmp)); this->ReversePointMap.insert(vtkstd::make_pair<vtkIdType,vtkIdType>(*x,tmp));
} }
output->InsertNextCell( VTK_VERTEX, 1, x ); output->InsertNextCell( VTK_VERTEX, 1, x );
} }
...@@ -2779,7 +2779,7 @@ void vtkExodusIIReaderPrivate::InsertSetCellCopies( vtkIntArray* refs, int otyp, ...@@ -2779,7 +2779,7 @@ void vtkExodusIIReaderPrivate::InsertSetCellCopies( vtkIntArray* refs, int otyp,
if ( *x < 0 ) if ( *x < 0 )
{ {
*x = this->NextSqueezePoint++; *x = this->NextSqueezePoint++;
this->ReversePointMap.insert(vtkstd::pair<vtkIdType,vtkIdType>(*x,cellConn[k])); this->ReversePointMap.insert(vtkstd::make_pair<vtkIdType,vtkIdType>(*x,cellConn[k]));
} }
cellConn[k] = *x; cellConn[k] = *x;
} }
...@@ -2828,7 +2828,7 @@ void vtkExodusIIReaderPrivate::InsertSetSides( vtkIntArray* refs, int otyp, int ...@@ -2828,7 +2828,7 @@ void vtkExodusIIReaderPrivate::InsertSetSides( vtkIntArray* refs, int otyp, int
if ( *x < 0 ) if ( *x < 0 )
{ {
*x = this->NextSqueezePoint++; *x = this->NextSqueezePoint++;
this->ReversePointMap.insert(vtkstd::pair<vtkIdType,vtkIdType>(*x,sideNodes[k])); this->ReversePointMap.insert(vtkstd::make_pair<vtkIdType,vtkIdType>(*x,sideNodes[k]));
} }
cellConn[k] = *x; cellConn[k] = *x;
} }
...@@ -3758,7 +3758,7 @@ vtkIdType vtkExodusIIReaderPrivate::GetSqueezePointId( int i ) ...@@ -3758,7 +3758,7 @@ vtkIdType vtkExodusIIReaderPrivate::GetSqueezePointId( int i )
if ( *x < 0 ) if ( *x < 0 )
{ {
*x = this->NextSqueezePoint++; *x = this->NextSqueezePoint++;
this->ReversePointMap.insert(vtkstd::pair<vtkIdType,vtkIdType>(*x,i)); this->ReversePointMap.insert(vtkstd::make_pair<vtkIdType,vtkIdType>(*x,i));
} }
return *x; return *x;
} }
...@@ -5381,7 +5381,7 @@ vtkDataArray* vtkExodusIIReaderPrivate::FindDisplacementVectors( int timeStep ) ...@@ -5381,7 +5381,7 @@ vtkDataArray* vtkExodusIIReaderPrivate::FindDisplacementVectors( int timeStep )
// -------------------------------------------------------- PUBLIC CLASS MEMBERS // -------------------------------------------------------- PUBLIC CLASS MEMBERS
vtkCxxRevisionMacro(vtkExodusIIReader,"1.25"); vtkCxxRevisionMacro(vtkExodusIIReader,"1.26");
vtkStandardNewMacro(vtkExodusIIReader); vtkStandardNewMacro(vtkExodusIIReader);
vtkCxxSetObjectMacro(vtkExodusIIReader,Metadata,vtkExodusIIReaderPrivate); vtkCxxSetObjectMacro(vtkExodusIIReader,Metadata,vtkExodusIIReaderPrivate);
vtkCxxSetObjectMacro(vtkExodusIIReader,ExodusModel,vtkExodusModel); vtkCxxSetObjectMacro(vtkExodusIIReader,ExodusModel,vtkExodusModel);
......
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