From eaf0f6ac1bc2f65770adf5ff6f17759485cd8072 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 20 Aug 2015 16:15:13 -0400
Subject: [PATCH] ENH: Remove use of include <vtksys/stl/*> and vtksys_stl::*
We no longer need this compatibility layer for the compilers we support.
Use the following commands to switch to standard header and namespace:
git grep -l vtksys/stl/ | xargs sed -i 's|vtksys/stl/||'
git grep -l vtksys_stl | xargs sed -i 's|vtksys_stl|std|g'
---
Common/Core/Testing/Cxx/TestArrayAPI.cxx | 2 +-
.../Testing/Cxx/TestArrayAPIConvenience.cxx | 2 +-
Common/Core/Testing/Cxx/TestArrayAPIDense.cxx | 2 +-
Common/Core/Testing/Cxx/TestArrayBool.cxx | 2 +-
Common/Core/Testing/Cxx/TestArrayCasting.cxx | 2 +-
Common/Core/Testing/Cxx/TestArrayExtents.cxx | 2 +-
.../Cxx/TestArrayInterpolationDense.cxx | 2 +-
.../Core/Testing/Cxx/TestArrayNullValues.cxx | 2 +-
.../Core/Testing/Cxx/TestArrayUserTypes.cxx | 2 +-
Common/Core/Testing/Cxx/TestArrayVariants.cxx | 2 +-
.../Testing/Cxx/TestSparseArrayValidation.cxx | 2 +-
.../Core/Testing/Cxx/TestUnicodeStringAPI.cxx | 4 ++--
.../Testing/Cxx/TestUnicodeStringArrayAPI.cxx | 4 ++--
Common/Core/vtkArrayExtentsList.h | 2 +-
Common/Core/vtkArrayWeights.cxx | 2 +-
Common/DataModel/vtkArrayData.cxx | 4 ++--
Domains/Chemistry/vtkCMLMoleculeReader.cxx | 4 ++--
Filters/Extraction/vtkExtractSelectedRows.cxx | 2 +-
.../Testing/Cxx/ArrayExtractFactoredArray.cxx | 2 +-
.../Testing/Cxx/ArrayMatricizeArray.cxx | 2 +-
.../Cxx/ArrayNormalizeMatrixVectors.cxx | 2 +-
Filters/General/vtkMatricizeArray.cxx | 2 +-
.../Testing/Cxx/TestMatlabEngineFilter.cxx | 2 +-
.../Testing/Cxx/TestMatlabEngineInterface.cxx | 2 +-
Filters/Selection/vtkLinearSelector.cxx | 2 +-
.../Testing/Cxx/ArrayAPIDenseCoordinates.cxx | 2 +-
.../Testing/Cxx/ArrayDiagonalMatrixSource.cxx | 2 +-
Filters/Sources/vtkGraphToPolyData.cxx | 6 ++---
.../Testing/Cxx/TestRCalculatorFilter.cxx | 2 +-
.../Testing/Cxx/TestRInterface.cxx | 2 +-
.../Testing/Cxx/TestRRandomTableSource.cxx | 2 +-
.../vtkContingencyStatisticsGnuR.cxx | 4 ++--
GUISupport/Qt/vtkTDxQtUnixDevices.cxx | 2 +-
Geovis/Core/vtkGeoFileImageSource.cxx | 2 +-
Geovis/Core/vtkGeoFileTerrainSource.cxx | 2 +-
Geovis/Core/vtkGeoProjectionSource.cxx | 4 ++--
IO/SQL/vtkRowQuery.cxx | 2 +-
IO/SQL/vtkSQLiteQuery.cxx | 2 +-
.../Testing/Cxx/BoostArrayLogWeighting.cxx | 2 +-
.../Cxx/BoostArrayRandomSparseArraySource.cxx | 2 +-
.../vtkBoostBreadthFirstSearch.cxx | 2 +-
.../Testing/Cxx/ArrayDotProductSimilarity.cxx | 2 +-
.../Testing/Cxx/ArraySparseArrayToTable.cxx | 2 +-
Infovis/Core/Testing/Cxx/ArrayToTable.cxx | 2 +-
.../Core/Testing/Cxx/ArrayTransposeMatrix.cxx | 2 +-
Infovis/Core/Testing/Cxx/TestArrayNorm.cxx | 2 +-
.../Core/vtkAdjacencyMatrixToEdgeTable.cxx | 4 ++--
Infovis/Core/vtkArrayToTable.cxx | 2 +-
Infovis/Core/vtkDotProductSimilarity.cxx | 2 +-
Infovis/Core/vtkSparseArrayToTable.cxx | 2 +-
Infovis/Core/vtkTableToArray.cxx | 2 +-
Infovis/Layout/vtkPassThroughEdgeStrategy.cxx | 6 ++---
.../Parallel/Testing/Cxx/PBGLRandomGraph.cxx | 6 ++---
.../Testing/Cxx/TestPBGLAlgorithms.cxx | 6 ++---
.../Testing/Cxx/TestPBGLCollectGraph.cxx | 4 ++--
.../Cxx/TestPBGLGraphSQLReaderFile.cxx | 4 ++--
.../Testing/Cxx/TestPRMATGraphSource.cxx | 4 ++--
.../Testing/Cxx/TestPRandomGraphSource.cxx | 4 ++--
.../Parallel/vtkPBGLBreadthFirstSearch.cxx | 2 +-
Infovis/Parallel/vtkPBGLCollectGraph.cxx | 6 ++---
Infovis/Parallel/vtkPBGLCollectGraph.h | 6 ++---
.../Parallel/vtkPBGLConnectedComponents.cxx | 2 +-
Infovis/Parallel/vtkPBGLGraphAdapter.h | 2 +-
.../Parallel/vtkPBGLMinimumSpanningTree.cxx | 4 ++--
Infovis/Parallel/vtkPBGLRMATGraphSource.cxx | 6 ++---
Infovis/Parallel/vtkPBGLRandomGraphSource.cxx | 6 ++---
Infovis/Parallel/vtkPBGLShortestPaths.cxx | 2 +-
Infovis/Parallel/vtkPBGLVertexColoring.cxx | 2 +-
.../OpenGL/vtkXRenderWindowTclInteractor.cxx | 2 +-
.../Tk/vtkXRenderWindowTclInteractor.cxx | 2 +-
ThirdParty/freerange/freerange | 24 +++++++++----------
Utilities/HashSource/vtkHashSource.cxx | 12 +++++-----
72 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/Common/Core/Testing/Cxx/TestArrayAPI.cxx b/Common/Core/Testing/Cxx/TestArrayAPI.cxx
index 0816de7256e..9566ac8c524 100644
--- a/Common/Core/Testing/Cxx/TestArrayAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayAPI.cxx
@@ -25,7 +25,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx b/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx
index 553ec5a50ae..fb7ad2d0795 100644
--- a/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx
@@ -24,7 +24,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx b/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx
index c69000edf96..2a663bdefee 100644
--- a/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx
@@ -24,7 +24,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestArrayBool.cxx b/Common/Core/Testing/Cxx/TestArrayBool.cxx
index bbea6f9da8a..5ad10685617 100644
--- a/Common/Core/Testing/Cxx/TestArrayBool.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayBool.cxx
@@ -25,7 +25,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestArrayCasting.cxx b/Common/Core/Testing/Cxx/TestArrayCasting.cxx
index 3654960205c..b7607720ba1 100644
--- a/Common/Core/Testing/Cxx/TestArrayCasting.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayCasting.cxx
@@ -26,7 +26,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#include <boost/algorithm/string.hpp>
diff --git a/Common/Core/Testing/Cxx/TestArrayExtents.cxx b/Common/Core/Testing/Cxx/TestArrayExtents.cxx
index 3cd4d51fe80..61876f8a111 100644
--- a/Common/Core/Testing/Cxx/TestArrayExtents.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayExtents.cxx
@@ -24,7 +24,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#include "vtkSetGet.h"
#define test_expression(expression) \
diff --git a/Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx b/Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx
index 40164a6ef85..6c38881f1e2 100644
--- a/Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx
@@ -24,7 +24,7 @@
#include <vtkSmartPointer.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
void test_expression(const bool expression, const std::string& message)
{
diff --git a/Common/Core/Testing/Cxx/TestArrayNullValues.cxx b/Common/Core/Testing/Cxx/TestArrayNullValues.cxx
index 876af1c6379..3894b6e8f3c 100644
--- a/Common/Core/Testing/Cxx/TestArrayNullValues.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayNullValues.cxx
@@ -23,7 +23,7 @@
#include <vtkSmartPointer.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
template<typename T>
void VerifyType(const T& DefaultNull, const T& AlternateNull)
diff --git a/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx b/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx
index 8b5538bf0be..a317004e5d9 100644
--- a/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx
@@ -25,7 +25,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestArrayVariants.cxx b/Common/Core/Testing/Cxx/TestArrayVariants.cxx
index 50d0e407b19..eb73174a831 100644
--- a/Common/Core/Testing/Cxx/TestArrayVariants.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayVariants.cxx
@@ -24,7 +24,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx b/Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx
index 70be17c40d0..7adb365c43f 100644
--- a/Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx
+++ b/Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx
@@ -24,7 +24,7 @@
#include <vtkSmartPointer.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx b/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx
index 36662ec3ddd..a251b6d0e5c 100644
--- a/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx
@@ -21,10 +21,10 @@
#include <vtkUnicodeString.h>
-#include <vtksys/stl/iterator>
+#include <iterator>
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx b/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx
index 33eb08ac195..7089f665a02 100644
--- a/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx
@@ -26,10 +26,10 @@
#include <vtkVariant.h>
#include <vtkTestErrorObserver.h>
-#include <vtksys/stl/iterator>
+#include <iterator>
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
static int TestErrorsAndWarnings();
diff --git a/Common/Core/vtkArrayExtentsList.h b/Common/Core/vtkArrayExtentsList.h
index 4fef84a4ad7..582fe529b78 100644
--- a/Common/Core/vtkArrayExtentsList.h
+++ b/Common/Core/vtkArrayExtentsList.h
@@ -43,7 +43,7 @@
#include "vtkCommonCoreModule.h" // For export macro
#include "vtkArrayExtents.h"
-#include <vtksys/stl/vector> // STL Header
+#include <vector> // STL Header
class VTKCOMMONCORE_EXPORT vtkArrayExtentsList
{
diff --git a/Common/Core/vtkArrayWeights.cxx b/Common/Core/vtkArrayWeights.cxx
index 60639c87fb0..0b82d76c961 100644
--- a/Common/Core/vtkArrayWeights.cxx
+++ b/Common/Core/vtkArrayWeights.cxx
@@ -20,7 +20,7 @@
=========================================================================*/
#include "vtkArrayWeights.h"
-#include <vtksys/stl/vector>
+#include <vector>
class vtkArrayWeightsStorage
{
diff --git a/Common/DataModel/vtkArrayData.cxx b/Common/DataModel/vtkArrayData.cxx
index 3d6e40c5c60..8ad5149ae7a 100644
--- a/Common/DataModel/vtkArrayData.cxx
+++ b/Common/DataModel/vtkArrayData.cxx
@@ -25,8 +25,8 @@
#include "vtkInformationVector.h"
#include "vtkObjectFactory.h"
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/vector>
+#include <algorithm>
+#include <vector>
//
// Standard functions
diff --git a/Domains/Chemistry/vtkCMLMoleculeReader.cxx b/Domains/Chemistry/vtkCMLMoleculeReader.cxx
index 2be83c2f6f4..2116a24b480 100644
--- a/Domains/Chemistry/vtkCMLMoleculeReader.cxx
+++ b/Domains/Chemistry/vtkCMLMoleculeReader.cxx
@@ -25,8 +25,8 @@
#include "vtkPeriodicTable.h"
#include "vtkXMLParser.h"
-#include <vtksys/stl/string>
-#include <vtksys/stl/vector>
+#include <string>
+#include <vector>
// Subclass of vtkXMLParser -- definitions at end of file
class vtkCMLParser : public vtkXMLParser
diff --git a/Filters/Extraction/vtkExtractSelectedRows.cxx b/Filters/Extraction/vtkExtractSelectedRows.cxx
index 6e0566cd3fa..51254279621 100644
--- a/Filters/Extraction/vtkExtractSelectedRows.cxx
+++ b/Filters/Extraction/vtkExtractSelectedRows.cxx
@@ -45,7 +45,7 @@
#include "vtkTree.h"
#include "vtkVertexListIterator.h"
-#include <vtksys/stl/map>
+#include <map>
#include <vector>
vtkStandardNewMacro(vtkExtractSelectedRows);
diff --git a/Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx b/Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx
index 05d7db9a8b4..26af1c29255 100644
--- a/Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx
+++ b/Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx
@@ -26,7 +26,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx b/Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx
index b6bb62d2f4e..95cb14b229e 100644
--- a/Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx
+++ b/Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx
@@ -26,7 +26,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Filters/General/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx b/Filters/General/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx
index 688f5b6072a..dfc0e3c6e50 100644
--- a/Filters/General/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx
+++ b/Filters/General/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx
@@ -27,7 +27,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Filters/General/vtkMatricizeArray.cxx b/Filters/General/vtkMatricizeArray.cxx
index d56698e9045..28540884cea 100644
--- a/Filters/General/vtkMatricizeArray.cxx
+++ b/Filters/General/vtkMatricizeArray.cxx
@@ -27,7 +27,7 @@
#include "vtkSmartPointer.h"
#include "vtkSparseArray.h"
-#include <vtksys/stl/numeric>
+#include <numeric>
///////////////////////////////////////////////////////////////////////////////
// vtkMatricizeArray
diff --git a/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx b/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx
index f78f5c97caa..56c4dc3b5c8 100644
--- a/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx
+++ b/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx
@@ -33,7 +33,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
namespace
{
diff --git a/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx b/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx
index 3e9033ee8de..373557daa24 100644
--- a/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx
+++ b/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx
@@ -27,7 +27,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#include <stdio.h>
#include <string.h>
#include <cassert>
diff --git a/Filters/Selection/vtkLinearSelector.cxx b/Filters/Selection/vtkLinearSelector.cxx
index 40c47a7843d..39a82a9d099 100644
--- a/Filters/Selection/vtkLinearSelector.cxx
+++ b/Filters/Selection/vtkLinearSelector.cxx
@@ -17,7 +17,7 @@
#include "vtkCompositeDataSet.h"
#include "vtkCompositeDataIterator.h"
-#include <vtksys/stl/vector>
+#include <vector>
vtkStandardNewMacro(vtkLinearSelector);
vtkCxxSetObjectMacro(vtkLinearSelector,Points,vtkPoints);
diff --git a/Filters/Sources/Testing/Cxx/ArrayAPIDenseCoordinates.cxx b/Filters/Sources/Testing/Cxx/ArrayAPIDenseCoordinates.cxx
index b6cfef1e12f..93ddc1aac78 100644
--- a/Filters/Sources/Testing/Cxx/ArrayAPIDenseCoordinates.cxx
+++ b/Filters/Sources/Testing/Cxx/ArrayAPIDenseCoordinates.cxx
@@ -27,7 +27,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Filters/Sources/Testing/Cxx/ArrayDiagonalMatrixSource.cxx b/Filters/Sources/Testing/Cxx/ArrayDiagonalMatrixSource.cxx
index eb11ade1cbc..bb952fad159 100644
--- a/Filters/Sources/Testing/Cxx/ArrayDiagonalMatrixSource.cxx
+++ b/Filters/Sources/Testing/Cxx/ArrayDiagonalMatrixSource.cxx
@@ -27,7 +27,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Filters/Sources/vtkGraphToPolyData.cxx b/Filters/Sources/vtkGraphToPolyData.cxx
index eb49f703e91..1f88d9b00f2 100644
--- a/Filters/Sources/vtkGraphToPolyData.cxx
+++ b/Filters/Sources/vtkGraphToPolyData.cxx
@@ -37,9 +37,9 @@
#include "vtkPolyData.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
+#include <map>
+#include <utility>
+#include <vector>
vtkStandardNewMacro(vtkGraphToPolyData);
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx
index f4da9a38ae9..83765e0761f 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx
@@ -37,7 +37,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
namespace
{
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx
index cc1f7d79254..e0045907045 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx
@@ -34,7 +34,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#include <stdio.h>
#include <string.h>
#include <cassert>
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx
index 9155ffac7c6..27260a3bb70 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx
@@ -29,7 +29,7 @@ PURPOSE. See the above copyright notice for more information.
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
namespace
{
diff --git a/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx b/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx
index 192f76294c7..550332c4098 100644
--- a/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx
+++ b/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx
@@ -33,8 +33,8 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkTable.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/vector>
+#include <map>
+#include <vector>
#include <vtksys/ios/sstream>
diff --git a/GUISupport/Qt/vtkTDxQtUnixDevices.cxx b/GUISupport/Qt/vtkTDxQtUnixDevices.cxx
index bef3f640a83..8d80f333526 100644
--- a/GUISupport/Qt/vtkTDxQtUnixDevices.cxx
+++ b/GUISupport/Qt/vtkTDxQtUnixDevices.cxx
@@ -14,7 +14,7 @@ PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkTDxQtUnixDevices.h"
-#include <vtksys/stl/map>
+#include <map>
#include <QApplication> // topLevelWidgets()
#include <QWidget>
#include <X11/Xlib.h> // Needed for X types used in the public interface
diff --git a/Geovis/Core/vtkGeoFileImageSource.cxx b/Geovis/Core/vtkGeoFileImageSource.cxx
index 21de343e19b..941ae08f864 100644
--- a/Geovis/Core/vtkGeoFileImageSource.cxx
+++ b/Geovis/Core/vtkGeoFileImageSource.cxx
@@ -34,7 +34,7 @@
#include <vtksys/ios/fstream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/utility>
+#include <utility>
vtkStandardNewMacro(vtkGeoFileImageSource);
//----------------------------------------------------------------------------
diff --git a/Geovis/Core/vtkGeoFileTerrainSource.cxx b/Geovis/Core/vtkGeoFileTerrainSource.cxx
index 1834b23c068..38889ad3dc8 100644
--- a/Geovis/Core/vtkGeoFileTerrainSource.cxx
+++ b/Geovis/Core/vtkGeoFileTerrainSource.cxx
@@ -30,7 +30,7 @@
#include <vtksys/ios/fstream>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/utility>
+#include <utility>
vtkStandardNewMacro(vtkGeoFileTerrainSource);
//----------------------------------------------------------------------------
diff --git a/Geovis/Core/vtkGeoProjectionSource.cxx b/Geovis/Core/vtkGeoProjectionSource.cxx
index fe0df830883..e6fdd00efe9 100644
--- a/Geovis/Core/vtkGeoProjectionSource.cxx
+++ b/Geovis/Core/vtkGeoProjectionSource.cxx
@@ -44,8 +44,8 @@
#include "vtkTransform.h"
#include "vtkTransformFilter.h"
-#include <vtksys/stl/stack>
-#include <vtksys/stl/utility>
+#include <stack>
+#include <utility>
// Heap dump method used for debugging threading issues on windows.
diff --git a/IO/SQL/vtkRowQuery.cxx b/IO/SQL/vtkRowQuery.cxx
index 8463658b2e3..86bc0f7f624 100644
--- a/IO/SQL/vtkRowQuery.cxx
+++ b/IO/SQL/vtkRowQuery.cxx
@@ -21,7 +21,7 @@
#include "vtkObjectFactory.h"
#include "vtkStdString.h"
-#include "vtksys/stl/algorithm"
+#include "algorithm"
#include "vtkVariantArray.h"
#include <ctype.h>
diff --git a/IO/SQL/vtkSQLiteQuery.cxx b/IO/SQL/vtkSQLiteQuery.cxx
index f6981c9abf8..866c979b8d3 100644
--- a/IO/SQL/vtkSQLiteQuery.cxx
+++ b/IO/SQL/vtkSQLiteQuery.cxx
@@ -30,7 +30,7 @@
#include <cassert>
#include <vtksys/ios/sstream>
-#include <vtksys/stl/vector>
+#include <vector>
#define BEGIN_TRANSACTION "BEGIN TRANSACTION"
#define COMMIT_TRANSACTION "COMMIT"
diff --git a/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayLogWeighting.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayLogWeighting.cxx
index 243821ebc7a..6825f39a5a4 100644
--- a/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayLogWeighting.cxx
+++ b/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayLogWeighting.cxx
@@ -27,7 +27,7 @@
#include <vtkTypedArray.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx
index afe24fbc3b4..4c0ed9dc89b 100644
--- a/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx
+++ b/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx
@@ -26,7 +26,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.cxx
index e77be82740b..bd76b7c5a52 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.cxx
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.cxx
@@ -48,7 +48,7 @@
#include <boost/graph/breadth_first_search.hpp>
#include <boost/pending/queue.hpp>
-#include <vtksys/stl/utility> // for pair
+#include <utility> // for pair
using namespace boost;
diff --git a/Infovis/Core/Testing/Cxx/ArrayDotProductSimilarity.cxx b/Infovis/Core/Testing/Cxx/ArrayDotProductSimilarity.cxx
index e2a8ff36879..19576e97ca3 100644
--- a/Infovis/Core/Testing/Cxx/ArrayDotProductSimilarity.cxx
+++ b/Infovis/Core/Testing/Cxx/ArrayDotProductSimilarity.cxx
@@ -28,7 +28,7 @@
#include <vtkVariant.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/Core/Testing/Cxx/ArraySparseArrayToTable.cxx b/Infovis/Core/Testing/Cxx/ArraySparseArrayToTable.cxx
index 23cb533bb3e..9cb1fa30ab9 100644
--- a/Infovis/Core/Testing/Cxx/ArraySparseArrayToTable.cxx
+++ b/Infovis/Core/Testing/Cxx/ArraySparseArrayToTable.cxx
@@ -27,7 +27,7 @@
#include <vtkTable.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/Core/Testing/Cxx/ArrayToTable.cxx b/Infovis/Core/Testing/Cxx/ArrayToTable.cxx
index 5572d649ae3..2f52d1c05d4 100644
--- a/Infovis/Core/Testing/Cxx/ArrayToTable.cxx
+++ b/Infovis/Core/Testing/Cxx/ArrayToTable.cxx
@@ -28,7 +28,7 @@
#include <vtkTable.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/Core/Testing/Cxx/ArrayTransposeMatrix.cxx b/Infovis/Core/Testing/Cxx/ArrayTransposeMatrix.cxx
index bc759c26acb..c89382cdbce 100644
--- a/Infovis/Core/Testing/Cxx/ArrayTransposeMatrix.cxx
+++ b/Infovis/Core/Testing/Cxx/ArrayTransposeMatrix.cxx
@@ -26,7 +26,7 @@
#include <vtkTransposeMatrix.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/Core/Testing/Cxx/TestArrayNorm.cxx b/Infovis/Core/Testing/Cxx/TestArrayNorm.cxx
index 2e412cbd39c..22da88a8e02 100644
--- a/Infovis/Core/Testing/Cxx/TestArrayNorm.cxx
+++ b/Infovis/Core/Testing/Cxx/TestArrayNorm.cxx
@@ -28,7 +28,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
#define test_expression(expression) \
{ \
diff --git a/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx
index ef410644f18..683361dfbb5 100644
--- a/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx
+++ b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx
@@ -32,8 +32,8 @@
#include "vtkTable.h"
#include <algorithm>
-#include <vtksys/stl/map>
-#include <vtksys/stl/functional>
+#include <map>
+#include <functional>
// ----------------------------------------------------------------------
diff --git a/Infovis/Core/vtkArrayToTable.cxx b/Infovis/Core/vtkArrayToTable.cxx
index 8d6dddde005..e0d644ab783 100644
--- a/Infovis/Core/vtkArrayToTable.cxx
+++ b/Infovis/Core/vtkArrayToTable.cxx
@@ -44,7 +44,7 @@
#include "vtkUnicodeStringArray.h"
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
/// Convert a 1D array to a table with one column ...
template<typename ValueT, typename ColumnT>
diff --git a/Infovis/Core/vtkDotProductSimilarity.cxx b/Infovis/Core/vtkDotProductSimilarity.cxx
index ea346444d0b..8b729806fd2 100644
--- a/Infovis/Core/vtkDotProductSimilarity.cxx
+++ b/Infovis/Core/vtkDotProductSimilarity.cxx
@@ -31,7 +31,7 @@
#include "vtkSmartPointer.h"
#include "vtkTable.h"
-#include <vtksys/stl/algorithm>
+#include <algorithm>
#include <map>
#include <stdexcept>
diff --git a/Infovis/Core/vtkSparseArrayToTable.cxx b/Infovis/Core/vtkSparseArrayToTable.cxx
index 7032a90a73f..4283f100fdf 100644
--- a/Infovis/Core/vtkSparseArrayToTable.cxx
+++ b/Infovis/Core/vtkSparseArrayToTable.cxx
@@ -32,7 +32,7 @@
#include "vtkTable.h"
#include <vtksys/ios/sstream>
-#include <vtksys/stl/stdexcept>
+#include <stdexcept>
template<typename ValueT, typename ValueColumnT>
static bool Convert(vtkArray* Array, const char* ValueColumn, vtkTable* Table)
diff --git a/Infovis/Core/vtkTableToArray.cxx b/Infovis/Core/vtkTableToArray.cxx
index ddea5bd9632..b7e0bc0382d 100644
--- a/Infovis/Core/vtkTableToArray.cxx
+++ b/Infovis/Core/vtkTableToArray.cxx
@@ -29,7 +29,7 @@
#include "vtkTableToArray.h"
#include "vtkVariant.h"
-#include <vtksys/stl/algorithm>
+#include <algorithm>
class vtkTableToArray::implementation
{
diff --git a/Infovis/Layout/vtkPassThroughEdgeStrategy.cxx b/Infovis/Layout/vtkPassThroughEdgeStrategy.cxx
index 8f5c575d2aa..05a10edeeaf 100644
--- a/Infovis/Layout/vtkPassThroughEdgeStrategy.cxx
+++ b/Infovis/Layout/vtkPassThroughEdgeStrategy.cxx
@@ -27,9 +27,9 @@
#include "vtkPoints.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
-#include <vtksys/stl/map>
+#include <utility>
+#include <vector>
+#include <map>
vtkStandardNewMacro(vtkPassThroughEdgeStrategy);
diff --git a/Infovis/Parallel/Testing/Cxx/PBGLRandomGraph.cxx b/Infovis/Parallel/Testing/Cxx/PBGLRandomGraph.cxx
index 687633ab73b..b5240ddc0b7 100644
--- a/Infovis/Parallel/Testing/Cxx/PBGLRandomGraph.cxx
+++ b/Infovis/Parallel/Testing/Cxx/PBGLRandomGraph.cxx
@@ -36,9 +36,9 @@
#include "vtkVariantArray.h"
#include "vtkDataSetAttributes.h"
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/functional>
-#include <vtksys/stl/vector>
+#include <algorithm>
+#include <functional>
+#include <vector>
#include <boost/mpi/datatype.hpp> // for get_mpi_datatype
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLAlgorithms.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLAlgorithms.cxx
index c851477b0d4..eebe59d5128 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLAlgorithms.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLAlgorithms.cxx
@@ -33,9 +33,9 @@
#include "vtkSmartPointer.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/functional>
-#include <vtksys/stl/vector>
+#include <algorithm>
+#include <functional>
+#include <vector>
#include <stdlib.h>
#include <cassert>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx
index 827cfbdf96a..2e54a430cc6 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx
@@ -31,8 +31,8 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkVertexListIterator.h"
-#include <vtksys/stl/functional>
-#include <vtksys/stl/string>
+#include <functional>
+#include <string>
#include <boost/mpi/collectives.hpp>
#include <boost/mpi/communicator.hpp>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx
index fc37543c418..9cd3a467b78 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx
@@ -47,8 +47,8 @@
#include "vtkViewTheme.h"
#include "vtkIntArray.h"
-#include <vtksys/stl/functional>
-#include <vtksys/stl/string>
+#include <functional>
+#include <string>
#include <boost/mpi/collectives.hpp>
#include <boost/mpi/communicator.hpp>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx b/Infovis/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx
index 9eb40a51a95..7ff35d54e10 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx
@@ -35,8 +35,8 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkVertexListIterator.h"
-#include <vtksys/stl/functional>
-#include <vtksys/stl/string>
+#include <functional>
+#include <string>
#include <boost/mpi/collectives.hpp>
#include <boost/mpi/communicator.hpp>
diff --git a/Infovis/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx b/Infovis/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx
index 9d74852bbe8..b5fbbe7c288 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx
@@ -35,8 +35,8 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkVertexListIterator.h"
-#include <vtksys/stl/functional>
-#include <vtksys/stl/string>
+#include <functional>
+#include <string>
#include <boost/mpi/collectives.hpp>
#include <boost/mpi/communicator.hpp>
diff --git a/Infovis/Parallel/vtkPBGLBreadthFirstSearch.cxx b/Infovis/Parallel/vtkPBGLBreadthFirstSearch.cxx
index 6d02cf252e6..5733fc22bb5 100644
--- a/Infovis/Parallel/vtkPBGLBreadthFirstSearch.cxx
+++ b/Infovis/Parallel/vtkPBGLBreadthFirstSearch.cxx
@@ -58,7 +58,7 @@
#include <boost/property_map/vector_property_map.hpp>
#include <boost/pending/queue.hpp>
-#include <vtksys/stl/utility> // for pair
+#include <utility> // for pair
using namespace boost;
diff --git a/Infovis/Parallel/vtkPBGLCollectGraph.cxx b/Infovis/Parallel/vtkPBGLCollectGraph.cxx
index 489790ad838..5f6103dbe65 100644
--- a/Infovis/Parallel/vtkPBGLCollectGraph.cxx
+++ b/Infovis/Parallel/vtkPBGLCollectGraph.cxx
@@ -49,9 +49,9 @@
#include <boost/mpi/collectives/all_reduce.hpp>
#include <boost/serialization/vector.hpp>
-#include <vtksys/stl/utility> // for pair
-#include <vtksys/stl/numeric> // for accumulate, partial_sum
-#include <vtksys/stl/functional> // for plus
+#include <utility> // for pair
+#include <numeric> // for accumulate, partial_sum
+#include <functional> // for plus
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
diff --git a/Infovis/Parallel/vtkPBGLCollectGraph.h b/Infovis/Parallel/vtkPBGLCollectGraph.h
index 215f2f321d9..a19d19fb6ac 100644
--- a/Infovis/Parallel/vtkPBGLCollectGraph.h
+++ b/Infovis/Parallel/vtkPBGLCollectGraph.h
@@ -47,9 +47,9 @@
#include "vtkInfovisParallelModule.h" // For export macro
#include "vtkStdString.h" // For string type
-#include <vtksys/stl/utility> // for pair
-#include <vtksys/stl/numeric> // for accumulate, partial_sum
-#include <vtksys/stl/functional> // for plus
+#include <utility> // for pair
+#include <numeric> // for accumulate, partial_sum
+#include <functional> // for plus
#include "vtkGraphAlgorithm.h"
diff --git a/Infovis/Parallel/vtkPBGLConnectedComponents.cxx b/Infovis/Parallel/vtkPBGLConnectedComponents.cxx
index 1539e9c70db..17f24610fd1 100644
--- a/Infovis/Parallel/vtkPBGLConnectedComponents.cxx
+++ b/Infovis/Parallel/vtkPBGLConnectedComponents.cxx
@@ -54,7 +54,7 @@
#include <boost/graph/strong_components.hpp>
#include <boost/graph/distributed/strong_components.hpp>
-#include <vtksys/stl/utility> // for pair
+#include <utility> // for pair
using namespace boost;
diff --git a/Infovis/Parallel/vtkPBGLGraphAdapter.h b/Infovis/Parallel/vtkPBGLGraphAdapter.h
index 475fdee72aa..478b67f39fa 100644
--- a/Infovis/Parallel/vtkPBGLGraphAdapter.h
+++ b/Infovis/Parallel/vtkPBGLGraphAdapter.h
@@ -29,7 +29,7 @@
#include "vtkBoostGraphAdapter.h" // for the sequential BGL adapters
//BTX
-#include <vtksys/stl/map> // required for Boost 1.54.0
+#include <map> // required for Boost 1.54.0
#include <boost/graph/use_mpi.hpp>
#include <boost/graph/distributed/mpi_process_group.hpp>
#include <boost/graph/properties.hpp>
diff --git a/Infovis/Parallel/vtkPBGLMinimumSpanningTree.cxx b/Infovis/Parallel/vtkPBGLMinimumSpanningTree.cxx
index 3259723890c..71544aefa6b 100644
--- a/Infovis/Parallel/vtkPBGLMinimumSpanningTree.cxx
+++ b/Infovis/Parallel/vtkPBGLMinimumSpanningTree.cxx
@@ -56,8 +56,8 @@
#include <boost/property_map/vector_property_map.hpp>
#include <boost/pending/queue.hpp>
-#include <vtksys/stl/utility> // for pair
-#include <vtksys/stl/iterator> // for back_inserter
+#include <utility> // for pair
+#include <iterator> // for back_inserter
using namespace boost;
diff --git a/Infovis/Parallel/vtkPBGLRMATGraphSource.cxx b/Infovis/Parallel/vtkPBGLRMATGraphSource.cxx
index 8e7d231371e..b80a604ff7a 100644
--- a/Infovis/Parallel/vtkPBGLRMATGraphSource.cxx
+++ b/Infovis/Parallel/vtkPBGLRMATGraphSource.cxx
@@ -42,9 +42,9 @@
#include "vtkPointData.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/set>
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/functional>
+#include <set>
+#include <algorithm>
+#include <functional>
#include <boost/mpi/communicator.hpp>
#include <boost/mpi/collectives/scan.hpp>
diff --git a/Infovis/Parallel/vtkPBGLRandomGraphSource.cxx b/Infovis/Parallel/vtkPBGLRandomGraphSource.cxx
index 952739257f8..86d7f633d9f 100644
--- a/Infovis/Parallel/vtkPBGLRandomGraphSource.cxx
+++ b/Infovis/Parallel/vtkPBGLRandomGraphSource.cxx
@@ -37,9 +37,9 @@
#include "vtkPointData.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/set>
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/functional>
+#include <set>
+#include <algorithm>
+#include <functional>
#include <boost/mpi/communicator.hpp>
#include <boost/mpi/collectives/scan.hpp>
diff --git a/Infovis/Parallel/vtkPBGLShortestPaths.cxx b/Infovis/Parallel/vtkPBGLShortestPaths.cxx
index b3e7283efc9..cad82a7feb5 100644
--- a/Infovis/Parallel/vtkPBGLShortestPaths.cxx
+++ b/Infovis/Parallel/vtkPBGLShortestPaths.cxx
@@ -56,7 +56,7 @@
#include <boost/property_map/property_map.hpp>
#include <boost/property_map/vector_property_map.hpp>
-#include <vtksys/stl/utility> // for pair
+#include <utility> // for pair
using namespace boost;
diff --git a/Infovis/Parallel/vtkPBGLVertexColoring.cxx b/Infovis/Parallel/vtkPBGLVertexColoring.cxx
index 9dc9a0a9f04..cb8eda49827 100644
--- a/Infovis/Parallel/vtkPBGLVertexColoring.cxx
+++ b/Infovis/Parallel/vtkPBGLVertexColoring.cxx
@@ -51,7 +51,7 @@
#include <boost/graph/parallel/algorithm.hpp>
#include <boost/property_map/property_map.hpp>
-#include <vtksys/stl/utility> // for pair
+#include <utility> // for pair
using namespace boost;
diff --git a/Rendering/OpenGL/vtkXRenderWindowTclInteractor.cxx b/Rendering/OpenGL/vtkXRenderWindowTclInteractor.cxx
index 7c077298d3a..dba7f17ce6b 100644
--- a/Rendering/OpenGL/vtkXRenderWindowTclInteractor.cxx
+++ b/Rendering/OpenGL/vtkXRenderWindowTclInteractor.cxx
@@ -19,7 +19,7 @@
#include "vtkObjectFactory.h"
#include "vtkXOpenGLRenderWindow.h"
-#include <vtksys/stl/map>
+#include <map>
#include "vtkTk.h"
diff --git a/Rendering/Tk/vtkXRenderWindowTclInteractor.cxx b/Rendering/Tk/vtkXRenderWindowTclInteractor.cxx
index 7c077298d3a..dba7f17ce6b 100644
--- a/Rendering/Tk/vtkXRenderWindowTclInteractor.cxx
+++ b/Rendering/Tk/vtkXRenderWindowTclInteractor.cxx
@@ -19,7 +19,7 @@
#include "vtkObjectFactory.h"
#include "vtkXOpenGLRenderWindow.h"
-#include <vtksys/stl/map>
+#include <map>
#include "vtkTk.h"
diff --git a/ThirdParty/freerange/freerange b/ThirdParty/freerange/freerange
index f4d3dc4f63f..132ffbbcad2 100644
--- a/ThirdParty/freerange/freerange
+++ b/ThirdParty/freerange/freerange
@@ -28,11 +28,11 @@
#include <assert.h>
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/deque>
-#include <vtksys/stl/functional>
-#include <vtksys/stl/vector>
-#include <vtksys/stl/stdexcept>
+#include <algorithm>
+#include <deque>
+#include <functional>
+#include <vector>
+#include <stdexcept>
#include <vtksys/ios/iostream>
#include <stdlib.h>
#include <string.h>
@@ -56,8 +56,8 @@ template< class T, class idx_t, T empty_entry=-1 >
class freerange
{
public:
- typedef vtksys_stl::deque<idx_t> dead_list_entry_t;
- typedef vtksys_stl::vector< dead_list_entry_t > dead_list_t;
+ typedef std::deque<idx_t> dead_list_entry_t;
+ typedef std::vector< dead_list_entry_t > dead_list_t;
protected:
T* array ;
idx_t array_len ; // max id + 1
@@ -119,7 +119,7 @@ class freerange
T* array_tmp = new T [ array_len ];
if ( ! array_tmp )
- throw vtksys_stl::runtime_error( "freerange memory allocation failed" );
+ throw std::runtime_error( "freerange memory allocation failed" );
for ( idx_t i=0; i<array_top; i++ )
array_tmp[i] = array[i];
delete [] array;
@@ -214,7 +214,7 @@ class freerange
array_len = new_size;
T* array_tmp = new T [ array_len ];
if ( ! array_tmp )
- throw vtksys_stl::runtime_error( "freerange memory allocation failed" );
+ throw std::runtime_error( "freerange memory allocation failed" );
if ( array_top > array_len ) {
used -= array_top - array_len;
array_top = array_len;
@@ -226,7 +226,7 @@ class freerange
array_tmp[i] = empty_entry;
array = array_tmp;
for ( i=1; i<dead_size; i++ ) { // dead[0] is unused
- typename dead_list_entry_t::iterator it = vtksys_stl::remove_if( dead[i].begin(), dead[i].end(), vtksys_stl::bind2nd( vtksys_stl::greater_equal<idx_t>(), new_size ) );
+ typename dead_list_entry_t::iterator it = std::remove_if( dead[i].begin(), dead[i].end(), std::bind2nd( std::greater_equal<idx_t>(), new_size ) );
dead[i].erase( it, dead[i].end() );
}
} else { // new_size > array_len
@@ -234,7 +234,7 @@ class freerange
array_len = new_size;
T* array_tmp = new T [ array_len ];
if ( ! array_tmp )
- throw vtksys_stl::runtime_error( "freerange memory allocation failed" );
+ throw std::runtime_error( "freerange memory allocation failed" );
for ( i=0; i<array_top; i++ )
array_tmp[i] = array[i];
for ( i=array_top; i<new_size; ++i )
@@ -292,7 +292,7 @@ class freerange
}
public:
- typedef vtksys_stl::bidirectional_iterator_tag iterator_category;
+ typedef std::bidirectional_iterator_tag iterator_category;
iterator()
{ fl = 0 ; posn = 0 ; }
diff --git a/Utilities/HashSource/vtkHashSource.cxx b/Utilities/HashSource/vtkHashSource.cxx
index 98407275613..9d06c96a4f6 100644
--- a/Utilities/HashSource/vtkHashSource.cxx
+++ b/Utilities/HashSource/vtkHashSource.cxx
@@ -13,14 +13,14 @@
=========================================================================*/
-#include <vtksys/stl/string>
+#include <string>
#include <vtksys/ios/fstream>
#include <vtksys/ios/iostream>
#include <vtksys/MD5.h>
#include <vtksys/SystemTools.hxx>
#include <vtksys/RegularExpression.hxx>
-static vtksys_stl::string HashMD5(vtksys_ios::istream& in)
+static std::string HashMD5(vtksys_ios::istream& in)
{
char hash[33];
vtksysMD5* hasher = vtksysMD5_New();
@@ -28,13 +28,13 @@ static vtksys_stl::string HashMD5(vtksys_ios::istream& in)
vtksys::RegularExpression key("\\$(Revision|Date|RCSfile):[^$]*\\$");
- vtksys_stl::string line;
+ std::string line;
while(vtksys::SystemTools::GetLineFromStream(in, line))
{
// Remove CVS key values from the line (simulate -kk).
while(key.find(line))
{
- vtksys_stl::string tmp = line.substr(0, key.start());
+ std::string tmp = line.substr(0, key.start());
tmp += "$";
tmp += key.match(1);
tmp += "$";
@@ -50,7 +50,7 @@ static vtksys_stl::string HashMD5(vtksys_ios::istream& in)
vtksysMD5_FinalizeHex(hasher, hash);
vtksysMD5_Delete(hasher);
hash[32] = 0;
- return vtksys_stl::string(hash);
+ return std::string(hash);
}
int main(int argc, char *argv[])
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
return 1;
}
- vtksys_stl::string md5 = HashMD5(fin);
+ std::string md5 = HashMD5(fin);
vtksys_ios::ostream* out = &vtksys_ios::cout;
vtksys_ios::ofstream fout;
--
GitLab