From ee0ee09ae677d85ef6c39a7ff8ff9bc0e6d0afa9 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Fri, 14 Oct 2016 15:58:20 +0200 Subject: [PATCH] Porting to 5.1.2 --- .../DifferenceTimesteps/vtkDifferenceTimestepsFilter.cxx | 4 ++-- .../DifferenceTimesteps/vtkDifferenceTimestepsFilter.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.cxx b/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.cxx index ee19ffda..ead6e86f 100644 --- a/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.cxx +++ b/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.cxx @@ -47,7 +47,7 @@ vtkDataArray* DataTempDiffArray(vtkDataArray* theDataArray, // Initialize and appoint a new name anOutput->SetNumberOfComponents(theNumComp); anOutput->SetNumberOfTuples(theNumTuple); - vtkstd::string aNewName = vtkstd::string(thePrefix) + theDataArray->GetName(); + std::string aNewName = std::string(thePrefix) + theDataArray->GetName(); anOutput->SetName(aNewName.c_str()); return anOutput; @@ -401,7 +401,7 @@ vtkDataSet* vtkDifferenceTimestepsFilter::DifferenceDataSet(vtkDataSet* theInput vtkDataSet *anOutput = anInput[0]->NewInstance(); anOutput->CopyStructure(anInput[0]); - vtkstd::vector anArrays; + std::vector anArrays; vtkDataArray *anOutputArray; // Compute the difference of the the specified point or cell data array diff --git a/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.h b/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.h index 9c5ba1ef..f232cc1d 100644 --- a/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.h +++ b/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.h @@ -125,7 +125,7 @@ protected: // Description: // Array of time step values. - vtkstd::vector TimeStepValues; + std::vector TimeStepValues; // Description: // Prefix of array name. -- 2.39.2