Commit eaf0f6ac authored by Brad King's avatar Brad King

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'
parent 42e4eb0f
......@@ -25,7 +25,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -24,7 +24,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -24,7 +24,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -25,7 +25,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -26,7 +26,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#include <boost/algorithm/string.hpp>
......
......@@ -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) \
......
......@@ -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)
{
......
......@@ -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)
......
......@@ -25,7 +25,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -24,7 +24,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -24,7 +24,7 @@
#include <vtkSmartPointer.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -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) \
{ \
......
......@@ -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();
......
......@@ -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
{
......
......@@ -20,7 +20,7 @@
=========================================================================*/
#include "vtkArrayWeights.h"
#include <vtksys/stl/vector>
#include <vector>
class vtkArrayWeightsStorage
{
......
......@@ -25,8 +25,8 @@
#include "vtkInformationVector.h"
#include "vtkObjectFactory.h"
#include <vtksys/stl/algorithm>
#include <vtksys/stl/vector>
#include <algorithm>
#include <vector>
//
// Standard functions
......
......@@ -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
......
......@@ -45,7 +45,7 @@
#include "vtkTree.h"
#include "vtkVertexListIterator.h"
#include <vtksys/stl/map>
#include <map>
#include <vector>
vtkStandardNewMacro(vtkExtractSelectedRows);
......
......@@ -26,7 +26,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -26,7 +26,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -27,7 +27,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -27,7 +27,7 @@
#include "vtkSmartPointer.h"
#include "vtkSparseArray.h"
#include <vtksys/stl/numeric>
#include <numeric>
///////////////////////////////////////////////////////////////////////////////
// vtkMatricizeArray
......
......@@ -33,7 +33,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
namespace
{
......
......@@ -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>
......
......@@ -17,7 +17,7 @@
#include "vtkCompositeDataSet.h"
#include "vtkCompositeDataIterator.h"
#include <vtksys/stl/vector>
#include <vector>
vtkStandardNewMacro(vtkLinearSelector);
vtkCxxSetObjectMacro(vtkLinearSelector,Points,vtkPoints);
......
......@@ -27,7 +27,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -27,7 +27,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -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);
......
......@@ -37,7 +37,7 @@
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
namespace
{
......
......@@ -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>
......
......@@ -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
{
......
......@@ -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>
......
......@@ -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
......
......@@ -34,7 +34,7 @@
#include <vtksys/ios/fstream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/utility>
#include <utility>
vtkStandardNewMacro(vtkGeoFileImageSource);
//----------------------------------------------------------------------------
......
......@@ -30,7 +30,7 @@
#include <vtksys/ios/fstream>
#include <vtksys/ios/sstream>
#include <vtksys/stl/utility>
#include <utility>
vtkStandardNewMacro(vtkGeoFileTerrainSource);
//----------------------------------------------------------------------------
......
......@@ -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.
......
......@@ -21,7 +21,7 @@
#include "vtkObjectFactory.h"
#include "vtkStdString.h"
#include "vtksys/stl/algorithm"
#include "algorithm"
#include "vtkVariantArray.h"
#include <ctype.h>
......
......@@ -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"
......
......@@ -27,7 +27,7 @@
#include <vtkTypedArray.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -26,7 +26,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -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;
......
......@@ -28,7 +28,7 @@
#include <vtkVariant.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -27,7 +27,7 @@
#include <vtkTable.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -28,7 +28,7 @@
#include <vtkTable.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -26,7 +26,7 @@
#include <vtkTransposeMatrix.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -28,7 +28,7 @@
#include <vtkSparseArray.h>
#include <vtksys/ios/iostream>
#include <vtksys/stl/stdexcept>
#include <stdexcept>
#define test_expression(expression) \
{ \
......
......@@ -32,8 +32,8 @@
#include "vtkTable.h"
#include <algorithm>
#include <vtksys/stl/map>
#include <vtksys/stl/functional>
#include <map>
#include <functional>
// ----------------------------------------------------------------------
......
......@@ -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>
......
......@@ -31,7 +31,7 @@
#include "vtkSmartPointer.h"
#include "vtkTable.h"
#include <vtksys/stl/algorithm>
#include <algorithm>
#include <map>
#include <stdexcept>
......
......@@ -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)
......
......@@ -29,7 +29,7 @@
#include "vtkTableToArray.h"
#include "vtkVariant.h"
#include <vtksys/stl/algorithm>
#include <algorithm>
class vtkTableToArray::implementation
{
......
......@@ -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);
......
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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;
......
......@@ -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()
......
......@@ -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"
......
......@@ -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;
......
......@@ -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>
......
......@@ -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;
......
......@@ -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>
......
......@@ -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>
......
......@@ -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;
......
......@@ -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