Skip to content

Commit

Permalink
ENH: Remove use of include <vtksys/ios/*> and vtksys_ios::*
Browse files Browse the repository at this point in the history
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/ios/ | xargs sed -i 's|vtksys/ios/||'
 git grep -l vtksys_ios | xargs sed -i 's|vtksys_ios|std|g'
  • Loading branch information
bradking committed Aug 20, 2015
1 parent eaf0f6a commit 3ae7dd3
Show file tree
Hide file tree
Showing 191 changed files with 225 additions and 225 deletions.
4 changes: 2 additions & 2 deletions Common/Core/Testing/Cxx/TestArrayAPI.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>

#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <iostream>
#include <sstream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
4 changes: 2 additions & 2 deletions Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <vtkDenseArray.h>
#include <vtkSmartPointer.h>

#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <iostream>
#include <sstream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
4 changes: 2 additions & 2 deletions Common/Core/Testing/Cxx/TestArrayAPIDense.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <vtkDenseArray.h>
#include <vtkSmartPointer.h>

#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <iostream>
#include <sstream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
4 changes: 2 additions & 2 deletions Common/Core/Testing/Cxx/TestArrayBool.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>

#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <iostream>
#include <sstream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
4 changes: 2 additions & 2 deletions Common/Core/Testing/Cxx/TestArrayCasting.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <vtkSparseArray.h>
#include <vtkTryDowncast.h>

#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <iostream>
#include <sstream>
#include <stdexcept>

#include <boost/algorithm/string.hpp>
Expand Down
4 changes: 2 additions & 2 deletions Common/Core/Testing/Cxx/TestArrayExtents.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <vtkArrayCoordinates.h>
#include <vtkArrayExtents.h>

#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <iostream>
#include <sstream>
#include <stdexcept>
#include "vtkSetGet.h"

Expand Down
2 changes: 1 addition & 1 deletion Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <vtkDenseArray.h>
#include <vtkSmartPointer.h>

#include <vtksys/ios/iostream>
#include <iostream>
#include <stdexcept>

void test_expression(const bool expression, const std::string& message)
Expand Down
2 changes: 1 addition & 1 deletion Common/Core/Testing/Cxx/TestArrayNullValues.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <vtkSparseArray.h>
#include <vtkSmartPointer.h>

#include <vtksys/ios/iostream>
#include <iostream>
#include <stdexcept>

template<typename T>
Expand Down
4 changes: 2 additions & 2 deletions Common/Core/Testing/Cxx/TestArrayUserTypes.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>

#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <iostream>
#include <sstream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
4 changes: 2 additions & 2 deletions Common/Core/Testing/Cxx/TestArrayVariants.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <vtkDenseArray.h>
#include <vtkSmartPointer.h>

#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <iostream>
#include <sstream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
2 changes: 1 addition & 1 deletion Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <vtkSparseArray.h>
#include <vtkSmartPointer.h>

#include <vtksys/ios/iostream>
#include <iostream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
4 changes: 2 additions & 2 deletions Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <vtkUnicodeString.h>

#include <iterator>
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <iostream>
#include <sstream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
4 changes: 2 additions & 2 deletions Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include <vtkTestErrorObserver.h>

#include <iterator>
#include <vtksys/ios/iostream>
#include <vtksys/ios/sstream>
#include <iostream>
#include <sstream>
#include <stdexcept>

static int TestErrorsAndWarnings();
Expand Down
2 changes: 1 addition & 1 deletion Common/Core/vtkAndroidOutputWindow.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "vtkObjectFactory.h"
#include "vtkCommand.h"
#include "vtksys/ios/sstream"
#include "sstream"


#include <android/log.h>
Expand Down
2 changes: 1 addition & 1 deletion Common/Core/vtkGarbageCollector.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "vtkObjectFactory.h"
#include "vtkSmartPointerBase.h"

#include <vtksys/ios/sstream>
#include <sstream>
#include <queue>
#include <stack>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion Common/Core/vtkObjectBase.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "vtkGarbageCollector.h"
#include "vtkWeakPointerBase.h"

#include <vtksys/ios/sstream>
#include <sstream>

#define vtkBaseDebugMacro(x)

Expand Down
2 changes: 1 addition & 1 deletion Common/Core/vtkTimePointUtility.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "vtkObjectFactory.h"
#include "vtkStdString.h"

#include "vtksys/ios/sstream"
#include "sstream"

#if defined (__BORLANDC__)
#include <ctype.h> // for isdigit
Expand Down
2 changes: 1 addition & 1 deletion Common/Core/vtkVariant.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ really building the vtkVariant.o object.
#include "vtkStringArray.h"
#include "vtkMath.h"

#include "vtksys/ios/sstream"
#include "sstream"
#include "vtksys/SystemTools.hxx"
#include <locale> // C++ locale

Expand Down
2 changes: 1 addition & 1 deletion Common/DataModel/Testing/Cxx/otherCellArray.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "vtkIdTypeArray.h"
#include "vtkQuad.h"

#include <vtksys/ios/sstream>
#include <sstream>

int TestCellArray(ostream& strm)
{
Expand Down
2 changes: 1 addition & 1 deletion Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "vtkPentagonalPrism.h"
#include "vtkHexagonalPrism.h"

#include <vtksys/ios/sstream>
#include <sstream>

int TestOCB(ostream& strm)
{
Expand Down
2 changes: 1 addition & 1 deletion Common/DataModel/Testing/Cxx/otherCellPosition.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "vtkPentagonalPrism.h"
#include "vtkHexagonalPrism.h"

#include <vtksys/ios/sstream>
#include <sstream>

int TestOCP(ostream& strm)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "vtkColorTransferFunction.h"
#include "vtkDebugLeaks.h"

#include <vtksys/ios/sstream>
#include <sstream>

int Test(ostream& strm)
{
Expand Down
2 changes: 1 addition & 1 deletion Common/DataModel/Testing/Cxx/otherEmptyCell.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "vtkPointData.h"
#include "vtkCellData.h"

#include <vtksys/ios/sstream>
#include <sstream>

#include "vtkDebugLeaks.h"

Expand Down
2 changes: 1 addition & 1 deletion Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "vtkRectilinearGrid.h"
#include "vtkShortArray.h"

#include <vtksys/ios/sstream>
#include <sstream>

int TestORG(ostream& strm)
{
Expand Down
2 changes: 1 addition & 1 deletion Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "vtkShortArray.h"
#include "vtkStructuredGrid.h"

#include <vtksys/ios/sstream>
#include <sstream>

int TestOSG(ostream& strm)
{
Expand Down
2 changes: 1 addition & 1 deletion Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "vtkQuadraticPyramid.h"
#include "vtkPoints.h"

#include <vtksys/ios/sstream>
#include <sstream>

// New quadratic cells
#include "vtkBiQuadraticQuad.h"
Expand Down
2 changes: 1 addition & 1 deletion Common/DataModel/vtkQuadratureSchemeDefinition.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "vtkInformationStringKey.h"
#include "vtkCellType.h"
#include "vtkXMLDataElement.h"
#include "vtksys/ios/sstream"
#include "sstream"
using std::ostringstream;
using std::istringstream;
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion Common/DataModel/vtkXMLDataElement.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "vtkObjectFactory.h"

#include <ctype.h>
#include <vtksys/ios/sstream>
#include <sstream>
using std::ostringstream;
using std::istringstream;
#include <vtksys/SystemTools.hxx>
Expand Down
2 changes: 1 addition & 1 deletion Common/ExecutionModel/vtkExecutive.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "vtkSmartPointer.h"

#include <vector>
#include <vtksys/ios/sstream>
#include <sstream>

#include "vtkCompositeDataPipeline.h"

Expand Down
2 changes: 1 addition & 1 deletion Common/System/Testing/Cxx/otherTimerLog.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "vtkTimerLog.h"
#include "vtkDebugLeaks.h"

#include <vtksys/ios/sstream>
#include <sstream>

// this is needed for the unlink call
#if defined(__CYGWIN__)
Expand Down
2 changes: 1 addition & 1 deletion Examples/Array/Cxx/IdentityMatrix.cxx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <vtkArrayPrint.h>
#include <vtkSparseArray.h>

#include <vtksys/ios/sstream>
#include <sstream>

int main(int argc, char* argv[])
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/HyperTree/Cxx/HyperTreeGridDemonstrator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ All rights reserved.

#include "vtksys/CommandLineArguments.hxx"

#include <vtksys/ios/sstream>
#include <sstream>

void SetInputParameters( int& dim,
int& branch,
Expand Down
2 changes: 1 addition & 1 deletion Examples/MultiBlock/Cxx/MultiBlock.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "vtkStructuredGridOutlineFilter.h"
#include "vtkTestUtilities.h"
#include "vtkXMLStructuredGridReader.h"
#include <vtksys/ios/sstream>
#include <sstream>

int main(int argc, char* argv[])
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/Statistics/ExampleKMeansStatistics.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "vtkStdString.h"
#include "vtkTimerLog.h"

#include <vtksys/ios/sstream>
#include <sstream>


//=============================================================================
Expand Down
2 changes: 1 addition & 1 deletion Filters/Extraction/vtkExtractArraysOverTime.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <cassert>
#include <map>
#include <string>
#include <vtksys/ios/sstream>
#include <sstream>
#include <vector>

class vtkExtractArraysOverTime::vtkInternal
Expand Down
2 changes: 1 addition & 1 deletion Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>

#include <vtksys/ios/iostream>
#include <iostream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
2 changes: 1 addition & 1 deletion Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>

#include <vtksys/ios/iostream>
#include <iostream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <vtkSmartPointer.h>
#include <vtkSparseArray.h>

#include <vtksys/ios/iostream>
#include <iostream>
#include <stdexcept>

#define test_expression(expression) \
Expand Down
2 changes: 1 addition & 1 deletion Filters/General/vtkQuadraturePointInterpolator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "vtkInformationQuadratureSchemeDefinitionVectorKey.h"
#include "vtkObjectFactory.h"

#include "vtksys/ios/sstream"
#include "sstream"
using std::ostringstream;

#include "vtkQuadraturePointsUtilities.hxx"
Expand Down
2 changes: 1 addition & 1 deletion Filters/General/vtkQuadraturePointsGenerator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "vtkQuadratureSchemeDefinition.h"
#include "vtkQuadraturePointsUtilities.hxx"

#include "vtksys/ios/sstream"
#include "sstream"
using std::ostringstream;

//-----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "vtkInformationQuadratureSchemeDefinitionVectorKey.h"
#include "vtkObjectFactory.h"

#include <vtksys/ios/sstream>
#include <sstream>
#include <string>
#include "vtkSmartPointer.h"
using std::ostringstream;
Expand Down
2 changes: 1 addition & 1 deletion Filters/General/vtkSplitColumnComponents.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "vtkStdString.h"
#include "vtkTable.h"

#include "vtksys/ios/sstream"
#include "sstream"
#include "math.h"

vtkStandardNewMacro(vtkSplitColumnComponents);
Expand Down
Loading

0 comments on commit 3ae7dd3

Please sign in to comment.