diff --git a/Charts/Core/vtkAxis.cxx b/Charts/Core/vtkAxis.cxx
index 3602856a31306f3338901312a79957679ff8e1cb..80013fb7313879ab655c9bfc983243558ffb0924 100644
--- a/Charts/Core/vtkAxis.cxx
+++ b/Charts/Core/vtkAxis.cxx
@@ -29,7 +29,7 @@
#include "vtkStdString.h"
#include "vtkAxisExtended.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
#include "vtkObjectFactory.h"
#include <algorithm>
@@ -1133,7 +1133,7 @@ void vtkAxis::GenerateTickLabels(double min, double max)
// Now create a label for the tick position
if (this->TickLabelAlgorithm == vtkAxis::TICK_SIMPLE)
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
if (this->Notation > 0)
{
@@ -1142,7 +1142,7 @@ void vtkAxis::GenerateTickLabels(double min, double max)
if (this->Notation == 1)
{
// Scientific notation
- ostr.setf(vtksys_ios::ios::scientific, vtksys_ios::ios::floatfield);
+ ostr.setf(std::ios::scientific, std::ios::floatfield);
}
else if (this->Notation == 2)
{
@@ -1174,7 +1174,7 @@ void vtkAxis::GenerateTickLabels()
value = pow(double(10.0), double(value));
}
// Now create a label for the tick position
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
if (this->Notation > 0)
{
@@ -1182,7 +1182,7 @@ void vtkAxis::GenerateTickLabels()
}
if (this->Notation == SCIENTIFIC_NOTATION)
{
- ostr.setf(vtksys_ios::ios::scientific, vtksys_ios::ios::floatfield);
+ ostr.setf(std::ios::scientific, std::ios::floatfield);
}
else if (this->Notation == FIXED_NOTATION)
{
@@ -1206,7 +1206,7 @@ void vtkAxis::GenerateTickLabels()
// 8 - Factored Scientific 5 (10^6)
void vtkAxis::GenerateLabelFormat(int notation, double n)
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
switch(notation)
@@ -1214,7 +1214,7 @@ void vtkAxis::GenerateLabelFormat(int notation, double n)
case 1:
ostr << n;
ostr.precision(this->Precision);
- ostr.setf(vtksys_ios::ios::scientific, vtksys_ios::ios::floatfield);
+ ostr.setf(std::ios::scientific, std::ios::floatfield);
this->TickLabels->InsertNextValue(ostr.str());
break;
case 2:
@@ -1289,7 +1289,7 @@ void vtkAxis::GenerateLabelFormat(int notation, double n)
break;
case 8:
ostr.precision(this->Precision);
- ostr.setf(vtksys_ios::ios::scientific, vtksys_ios::ios::floatfield);
+ ostr.setf(std::ios::scientific, std::ios::floatfield);
ostr << n/1000.0 ;
if(!TitleAppended)
{
@@ -1516,7 +1516,7 @@ void vtkAxis::GenerateLogSpacedLinearTicks(int order, double min, double max)
this->TickPositions->InsertNextValue(log10(value));
// Now create a label for the tick position
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
if (this->Notation > 0)
{
@@ -1524,7 +1524,7 @@ void vtkAxis::GenerateLogSpacedLinearTicks(int order, double min, double max)
}
if (this->Notation == SCIENTIFIC_NOTATION)
{
- ostr.setf(vtksys_ios::ios::scientific, vtksys_ios::ios::floatfield);
+ ostr.setf(std::ios::scientific, std::ios::floatfield);
}
else if (this->Notation == FIXED_NOTATION)
{
@@ -1590,7 +1590,7 @@ void vtkAxis::GenerateLogScaleTickMarks(int order,
if (niceTickMark)
{
// Now create a label for the tick position
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
if (this->Notation > 0)
{
@@ -1598,7 +1598,7 @@ void vtkAxis::GenerateLogScaleTickMarks(int order,
}
if (this->Notation == SCIENTIFIC_NOTATION)
{
- ostr.setf(vtksys_ios::ios::scientific, vtksys_ios::ios::floatfield);
+ ostr.setf(std::ios::scientific, std::ios::floatfield);
}
else if (this->Notation == FIXED_NOTATION)
{
diff --git a/Charts/Core/vtkAxisExtended.cxx b/Charts/Core/vtkAxisExtended.cxx
index 585bf3de1f80833077bd5048278e8dc712063a11..6ae93df23325d7c0d6ab3b900c0ad23c6b60fbdc 100644
--- a/Charts/Core/vtkAxisExtended.cxx
+++ b/Charts/Core/vtkAxisExtended.cxx
@@ -19,7 +19,7 @@
#include "vtkStdString.h"
#include "vtkObjectFactory.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#include <cmath>
#include <algorithm>
@@ -197,7 +197,7 @@ double vtkAxisExtended::FormatLegibilityScore(double n, int format)
// This method returns the length of the label given the format
int vtkAxisExtended::FormatStringLength(int format, double n, int precision)
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
int numSize(0);
@@ -205,7 +205,7 @@ int vtkAxisExtended::FormatStringLength(int format, double n, int precision)
{
case 1:
ostr.precision(precision);
- ostr.setf(vtksys_ios::ios::scientific, vtksys_ios::ios::floatfield);
+ ostr.setf(std::ios::scientific, std::ios::floatfield);
ostr<<n;
numSize = (int) ostr.str().length();
return numSize;
@@ -266,7 +266,7 @@ int vtkAxisExtended::FormatStringLength(int format, double n, int precision)
return numSize; // Three 0's get reduced
case 8:
ostr.precision(precision);
- ostr.setf(vtksys_ios::ios::scientific, vtksys_ios::ios::floatfield);
+ ostr.setf(std::ios::scientific, std::ios::floatfield);
ostr<<n/1000;
numSize = (int) ostr.str().length();
return numSize;
diff --git a/Charts/Core/vtkChartPie.cxx b/Charts/Core/vtkChartPie.cxx
index b11ec0514afa218dd693278be3dab0caf6a705d5..5c1d1c4256bad57b0a07fd456d6674c24bc9bb21 100644
--- a/Charts/Core/vtkChartPie.cxx
+++ b/Charts/Core/vtkChartPie.cxx
@@ -28,7 +28,7 @@
#include "vtkChartLegend.h"
#include "vtkTooltipItem.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
class vtkChartPiePrivate
{
@@ -272,7 +272,7 @@ bool vtkChartPie::LocatePointInPlots(const vtkContextMouseEvent &mouse)
if (labelIndex >= 0)
{
const char *label = this->Private->Plot->GetLabel(labelIndex);
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr << label << ": " << plotPos.GetY();
this->Tooltip->SetText(ostr.str().c_str());
this->Tooltip->SetPosition(mouse.GetScreenPos()[0] + 2,
diff --git a/Charts/Core/vtkPlot.cxx b/Charts/Core/vtkPlot.cxx
index 5f9542a9a2ba58a029a06c02235ea0f4ec99bbba..ce62b05d0b66bfab6f5f9b8fe8c3508038826333 100644
--- a/Charts/Core/vtkPlot.cxx
+++ b/Charts/Core/vtkPlot.cxx
@@ -25,7 +25,7 @@
#include "vtkObjectFactory.h"
#include "vtkStringArray.h"
#include "vtkNew.h"
-#include "vtksys/ios/sstream"
+#include "sstream"
vtkCxxSetObjectMacro(vtkPlot, XAxis, vtkAxis);
vtkCxxSetObjectMacro(vtkPlot, YAxis, vtkAxis);
@@ -144,7 +144,7 @@ vtkStdString vtkPlot::GetTooltipLabel(const vtkVector2d &plotPos,
vtkStdString vtkPlot::GetNumber(double position, vtkAxis *axis)
{
// Determine and format the X and Y position in the chart
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr.precision(this->GetTooltipPrecision());
diff --git a/Common/Core/Testing/Cxx/TestArrayAPI.cxx b/Common/Core/Testing/Cxx/TestArrayAPI.cxx
index 8564aba36607af528ecceb42ca6978d1ccec5ee2..0816de7256ecdaa05a7186b09d7bf418b3b9d369 100644
--- a/Common/Core/Testing/Cxx/TestArrayAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayAPI.cxx
@@ -31,7 +31,7 @@
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx b/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx
index 837e515ec065b73e16a60aa44ccf1fe56de94b0b..553ec5a50ae0de55cfc5878242dad22861aa6ad7 100644
--- a/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx
@@ -30,7 +30,7 @@
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx b/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx
index c7428ed7882fd383390c0d8f04e4894629e2231c..c69000edf9676c16910d85339457a2038369262a 100644
--- a/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx
@@ -30,7 +30,7 @@
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Common/Core/Testing/Cxx/TestArrayBool.cxx b/Common/Core/Testing/Cxx/TestArrayBool.cxx
index 40773e40b250ae7754db895d87ba9d9963590aed..bbea6f9da8a8c09767e5c746e8d3fc6a0600ddf8 100644
--- a/Common/Core/Testing/Cxx/TestArrayBool.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayBool.cxx
@@ -31,7 +31,7 @@
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Common/Core/Testing/Cxx/TestArrayExtents.cxx b/Common/Core/Testing/Cxx/TestArrayExtents.cxx
index 5bc82df245c84a0c83e2dc15e97583b36836388d..3cd4d51fe80c2fdf19a81e5105641f0f22a8bb12 100644
--- a/Common/Core/Testing/Cxx/TestArrayExtents.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayExtents.cxx
@@ -31,7 +31,7 @@
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Common/Core/Testing/Cxx/TestArrayLookup.cxx b/Common/Core/Testing/Cxx/TestArrayLookup.cxx
index eeee7e808b835204f49c3708b2d5f6896ba7d0d2..698ae0b71dbd5345613a4b258b6031d6ec8c2b1f 100644
--- a/Common/Core/Testing/Cxx/TestArrayLookup.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayLookup.cxx
@@ -26,22 +26,22 @@
#define VTK_CREATE(type,name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
-#include <vtksys/stl/vector>
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/utility>
-#include <vtksys/stl/map>
+#include <vector>
+#include <algorithm>
+#include <utility>
+#include <map>
struct NodeCompare
{
- bool operator()(const vtksys_stl::pair<int, vtkIdType>& a, const vtksys_stl::pair<int, vtkIdType>& b) const
+ bool operator()(const std::pair<int, vtkIdType>& a, const std::pair<int, vtkIdType>& b) const
{
return a.first < b.first;
}
};
-vtkIdType LookupValue(vtksys_stl::multimap<int, vtkIdType>& lookup, int value)
+vtkIdType LookupValue(std::multimap<int, vtkIdType>& lookup, int value)
{
- vtksys_stl::pair<const int, vtkIdType> found = *lookup.lower_bound(value);
+ std::pair<const int, vtkIdType> found = *lookup.lower_bound(value);
if (found.first == value)
{
return found.second;
@@ -49,12 +49,12 @@ vtkIdType LookupValue(vtksys_stl::multimap<int, vtkIdType>& lookup, int value)
return -1;
}
-vtkIdType LookupValue(vtksys_stl::vector<vtksys_stl::pair<int, vtkIdType> >& lookup, int value)
+vtkIdType LookupValue(std::vector<std::pair<int, vtkIdType> >& lookup, int value)
{
NodeCompare comp;
- vtksys_stl::pair<int, vtkIdType> val(value, 0);
- vtksys_stl::pair<int, vtkIdType> found =
- *vtksys_stl::lower_bound(lookup.begin(), lookup.end(), val, comp);
+ std::pair<int, vtkIdType> val(value, 0);
+ std::pair<int, vtkIdType> found =
+ *std::lower_bound(lookup.begin(), lookup.end(), val, comp);
if (found.first == value)
{
return found.second;
@@ -65,7 +65,7 @@ vtkIdType LookupValue(vtksys_stl::vector<vtksys_stl::pair<int, vtkIdType> >& loo
vtkIdType LookupValue(vtkIntArray* lookup, vtkIdTypeArray* index, int value)
{
int* ptr = lookup->GetPointer(0);
- vtkIdType place = static_cast<vtkIdType>(vtksys_stl::lower_bound(ptr, ptr + lookup->GetNumberOfTuples(), value) - ptr);
+ vtkIdType place = static_cast<vtkIdType>(std::lower_bound(ptr, ptr + lookup->GetNumberOfTuples(), value) - ptr);
if (place < lookup->GetNumberOfTuples() && ptr[place] == value)
{
return index->GetValue(place);
@@ -463,7 +463,7 @@ int TestArrayLookupInt(vtkIdType numVal, bool runComparison)
// Time the lookup creation
timer->StartTimer();
int* ptr = arr->GetPointer(0);
- vtksys_stl::multimap<int, vtkIdType> map;
+ std::multimap<int, vtkIdType> map;
for (vtkIdType i = 0; i < arrSize; ++i, ++ptr)
{
map.insert(std::pair<const int, vtkIdType>(*ptr, i));
@@ -505,13 +505,13 @@ int TestArrayLookupInt(vtkIdType numVal, bool runComparison)
// Time lookup creation
timer->StartTimer();
ptr = arr->GetPointer(0);
- vtksys_stl::vector<vtksys_stl::pair<int, vtkIdType> > vec(arrSize);
+ std::vector<std::pair<int, vtkIdType> > vec(arrSize);
for (vtkIdType i = 0; i < arrSize; ++i, ++ptr)
{
- vec[i] = vtksys_stl::pair<int, vtkIdType>(*ptr, i);
+ vec[i] = std::pair<int, vtkIdType>(*ptr, i);
}
NodeCompare comp;
- vtksys_stl::sort(vec.begin(), vec.end(), comp);
+ std::sort(vec.begin(), vec.end(), comp);
timer->StopTimer();
cerr << "," << timer->GetElapsedTime();
diff --git a/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx b/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx
index 9e8db05e454fd0d5ef1ed61646bc4b237c7192bb..8b5538bf0bedc9f66277c3b16ac46a89971c4296 100644
--- a/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx
@@ -31,7 +31,7 @@
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Common/Core/Testing/Cxx/TestArrayVariants.cxx b/Common/Core/Testing/Cxx/TestArrayVariants.cxx
index be2aa91610ecde84eff258a853c68156fa55e2d7..50d0e407b19ac238d835d9d99c6959be18699aa5 100644
--- a/Common/Core/Testing/Cxx/TestArrayVariants.cxx
+++ b/Common/Core/Testing/Cxx/TestArrayVariants.cxx
@@ -30,7 +30,7 @@
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx b/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx
index adee5740f117e7b1e6e6739b807bf113e6f8e024..36662ec3ddd6178e10c0e44552fb64d941196428 100644
--- a/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx
@@ -30,7 +30,7 @@
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx b/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx
index d893ca2d77faba340b3f6c8d3d9d601d824de8f4..33eb08ac19526e8fe1110c91b162cf663aef0842 100644
--- a/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx
@@ -37,7 +37,7 @@ static int TestErrorsAndWarnings();
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Common/Core/Testing/Cxx/TestVariantComparison.cxx b/Common/Core/Testing/Cxx/TestVariantComparison.cxx
index 8ee2333b832a5395f2e363cf6936cb42f694bdb5..c232e16fbab6a20db4a159427ea22c26cecefec4 100644
--- a/Common/Core/Testing/Cxx/TestVariantComparison.cxx
+++ b/Common/Core/Testing/Cxx/TestVariantComparison.cxx
@@ -16,7 +16,7 @@
#include "vtkVariant.h"
#include "vtkObject.h"
-#include <vtksys/stl/map>
+#include <map>
#include <cstdio>
int
@@ -243,7 +243,7 @@ TestVariantComparison(int, char *[])
cerr << "Testing vtkVariant as STL map key... ";
- vtksys_stl::map<vtkVariant, vtkStdString> TestMap;
+ std::map<vtkVariant, vtkStdString> TestMap;
TestMap[vtkVariant(s)] = "short";
TestMap[vtkVariant(i)] = "int";
@@ -272,7 +272,7 @@ TestVariantComparison(int, char *[])
// This one should treat variants containing different types as
// unequal.
- vtksys_stl::map<vtkVariant, vtkStdString, vtkVariantStrictWeakOrder> TestMap2;
+ std::map<vtkVariant, vtkStdString, vtkVariantStrictWeakOrder> TestMap2;
TestMap2[vtkVariant()] = "invalid";
TestMap2[vtkVariant(s)] = "short";
TestMap2[vtkVariant(i)] = "int";
diff --git a/Common/Core/Testing/Cxx/otherArrays.cxx b/Common/Core/Testing/Cxx/otherArrays.cxx
index 37d3b6af1186d7c03990706db9fd8b9117934db5..497816221106e46d6caf68f8077524785747110a 100644
--- a/Common/Core/Testing/Cxx/otherArrays.cxx
+++ b/Common/Core/Testing/Cxx/otherArrays.cxx
@@ -26,7 +26,7 @@
#include "vtkDoubleArray.h"
#include "vtkIdTypeArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#define SIZE 1000
@@ -668,7 +668,7 @@ int otherArraysTest(ostream& strm)
int otherArrays(int, char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
// return otherArraysTest(vtkmsg_with_warning_C4701);
return otherArraysTest(cerr);
diff --git a/Common/Core/Testing/Cxx/otherByteSwap.cxx b/Common/Core/Testing/Cxx/otherByteSwap.cxx
index 86b26784a3eaff9c2ae4894d771c1fe2e0d830d0..658905926fd38ecd62c3acf328ba86151b959010 100644
--- a/Common/Core/Testing/Cxx/otherByteSwap.cxx
+++ b/Common/Core/Testing/Cxx/otherByteSwap.cxx
@@ -20,7 +20,7 @@
#include "vtkByteSwap.h"
#include "vtkDebugLeaks.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
int TestByteSwap(ostream& strm)
{
@@ -156,6 +156,6 @@ int TestByteSwap(ostream& strm)
int otherByteSwap(int,char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
return TestByteSwap(vtkmsg_with_warning_C4701);
}
diff --git a/Common/Core/Testing/Cxx/otherStringArray.cxx b/Common/Core/Testing/Cxx/otherStringArray.cxx
index 6e9b041ba3231a68819a1c4f3a9c75f07d0d6849..e9f38f572eb1e2a9aa472e187fe131c5305abf73 100644
--- a/Common/Core/Testing/Cxx/otherStringArray.cxx
+++ b/Common/Core/Testing/Cxx/otherStringArray.cxx
@@ -19,7 +19,7 @@
#include "vtkStringArray.h"
#include "vtkIdList.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
#define SIZE 1000
@@ -201,7 +201,7 @@ int otherStringArrayTest(ostream& strm)
int otherStringArray(int, char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
// return otherArraysTest(vtkmsg_with_warning_C4701);
return otherStringArrayTest(cerr);
diff --git a/Common/Core/vtkAndroidOutputWindow.cxx b/Common/Core/vtkAndroidOutputWindow.cxx
index f328edf53f8a7a070c85bcb21e1770ce42f45706..c43f27d1b716d0b5389090ee81dbdfa52b0d67a1 100644
--- a/Common/Core/vtkAndroidOutputWindow.cxx
+++ b/Common/Core/vtkAndroidOutputWindow.cxx
@@ -41,7 +41,7 @@ void vtkAndroidOutputWindow::DisplayErrorText(const char* someText)
return;
}
- vtksys_ios::istringstream stream(someText);
+ std::istringstream stream(someText);
std::string line;
while (std::getline(stream, line))
{
@@ -58,7 +58,7 @@ void vtkAndroidOutputWindow::DisplayWarningText(const char* someText)
return;
}
- vtksys_ios::istringstream stream(someText);
+ std::istringstream stream(someText);
std::string line;
while (std::getline(stream, line))
{
@@ -75,7 +75,7 @@ void vtkAndroidOutputWindow::DisplayGenericWarningText(const char* someText)
return;
}
- vtksys_ios::istringstream stream(someText);
+ std::istringstream stream(someText);
std::string line;
while (std::getline(stream, line))
{
@@ -91,7 +91,7 @@ void vtkAndroidOutputWindow::DisplayDebugText(const char* someText)
return;
}
- vtksys_ios::istringstream stream(someText);
+ std::istringstream stream(someText);
std::string line;
while (std::getline(stream, line))
{
@@ -107,7 +107,7 @@ void vtkAndroidOutputWindow::DisplayText(const char* someText)
return;
}
- vtksys_ios::istringstream stream(someText);
+ std::istringstream stream(someText);
std::string line;
while (std::getline(stream, line))
{
diff --git a/Common/Core/vtkArrayExtents.cxx b/Common/Core/vtkArrayExtents.cxx
index b0b6b813bf01bc0fd9bac20f40bf693162e744d6..a8813b9f8d4be8d34b86622878a3d14104bc4e3e 100644
--- a/Common/Core/vtkArrayExtents.cxx
+++ b/Common/Core/vtkArrayExtents.cxx
@@ -22,8 +22,8 @@
#include "vtkArrayCoordinates.h"
#include "vtkArrayExtents.h"
-#include <vtksys/stl/functional>
-#include <vtksys/stl/numeric>
+#include <functional>
+#include <numeric>
vtkArrayExtents::vtkArrayExtents()
{
@@ -77,7 +77,7 @@ const vtkArrayExtents vtkArrayExtents::Uniform(DimensionT n, CoordinateT m)
// IA64 HP-UX doesn't seem to have the vector<T> vector1(n, value)
// overload nor the assign(n, value) method, so we use the single
// argument constructor and initialize the values manually.
- // result.Storage = vtksys_stl::vector<vtkIdType>(n, m);
+ // result.Storage = std::vector<vtkIdType>(n, m);
result.Storage = std::vector<vtkArrayRange>(n);
for(DimensionT i = 0; i < n; i++)
diff --git a/Common/Core/vtkGarbageCollector.cxx b/Common/Core/vtkGarbageCollector.cxx
index 8f0335b12572cfb18555b5d446bce33004122d13..a5be8a7c9e679c19fa3effd2db50e31ed8a64397 100644
--- a/Common/Core/vtkGarbageCollector.cxx
+++ b/Common/Core/vtkGarbageCollector.cxx
@@ -613,7 +613,7 @@ void vtkGarbageCollectorImpl::Report(vtkObjectBase* obj, void* ptr,
if(this->Debug && vtkObject::GetGlobalWarningDisplay())
{
vtkObjectBase* current = this->Current->Object;
- vtksys_ios::ostringstream msg;
+ std::ostringstream msg;
msg << "Report: "
<< current->GetClassName() << "(" << current << ") "
<< (desc?desc:"")
@@ -709,7 +709,7 @@ void vtkGarbageCollectorImpl::PrintComponent(ComponentType* c)
{
if(this->Debug && vtkObject::GetGlobalWarningDisplay())
{
- vtksys_ios::ostringstream msg;
+ std::ostringstream msg;
msg << "Identified strongly connected component "
<< c->Identifier << " with net reference count "
<< c->NetCount << ":";
diff --git a/Common/Core/vtkInformationInternals.h b/Common/Core/vtkInformationInternals.h
index 1e0cc56e74b5420df880d0a2a9e232895197ecd5..2d248be5abef9852f20295e01281392929fc0603 100644
--- a/Common/Core/vtkInformationInternals.h
+++ b/Common/Core/vtkInformationInternals.h
@@ -28,7 +28,7 @@
#ifdef VTK_INFORMATION_USE_HASH_MAP
# include <vtksys/hash_map.hxx>
#else
-# include <vtksys/stl/map>
+# include <map>
#endif
//----------------------------------------------------------------------------
@@ -47,7 +47,7 @@ public:
};
typedef vtksys::hash_map<KeyType, DataType, HashFun> MapType;
#else
- typedef vtksys_stl::map<KeyType, DataType> MapType;
+ typedef std::map<KeyType, DataType> MapType;
#endif
MapType Map;
diff --git a/Common/Core/vtkTimePointUtility.cxx b/Common/Core/vtkTimePointUtility.cxx
index 74f4989ac7e8838882b3e2c97af52e54d0b8adc5..6e43f9a7bd68c9b7021f060414f8c0c6e8b11f72 100644
--- a/Common/Core/vtkTimePointUtility.cxx
+++ b/Common/Core/vtkTimePointUtility.cxx
@@ -362,7 +362,7 @@ const char* vtkTimePointUtility::TimePointToISO8601(vtkTypeUInt64 time, int form
int year, month, day, hour, minute, second, msec;
GetDateTime(time, year, month, day, hour, minute, second, msec);
- vtksys_ios::ostringstream oss;
+ std::ostringstream oss;
oss.imbue(std::locale::classic());
oss.fill('0');
if (format == ISO8601_DATETIME)
diff --git a/Common/Core/vtkVariant.cxx b/Common/Core/vtkVariant.cxx
index 045adf832f0dee5d22e0d3e985f4c0324588beab..461f37c0ad93722330546713f786d52c1e455f3c 100644
--- a/Common/Core/vtkVariant.cxx
+++ b/Common/Core/vtkVariant.cxx
@@ -744,7 +744,7 @@ template <typename iterT>
vtkStdString vtkVariantArrayToString(iterT* it)
{
vtkIdType maxInd = it->GetNumberOfValues();
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
for (vtkIdType i = 0; i < maxInd; i++)
{
if (i > 0)
@@ -772,72 +772,72 @@ vtkStdString vtkVariant::ToString() const
}
if (this->IsFloat())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr << this->Data.Float;
return vtkStdString(ostr.str());
}
if (this->IsDouble())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr << this->Data.Double;
return vtkStdString(ostr.str());
}
if (this->IsChar())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr << this->Data.Char;
return vtkStdString(ostr.str());
}
if (this->IsUnsignedChar())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr << static_cast<unsigned int>(this->Data.UnsignedChar);
return vtkStdString(ostr.str());
}
if (this->IsSignedChar())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr << this->Data.SignedChar;
return vtkStdString(ostr.str());
}
if (this->IsShort())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr << this->Data.Short;
return vtkStdString(ostr.str());
}
if (this->IsUnsignedShort())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr << this->Data.UnsignedShort;
return vtkStdString(ostr.str());
}
if (this->IsInt())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr << this->Data.Int;
return vtkStdString(ostr.str());
}
if (this->IsUnsignedInt())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr << this->Data.UnsignedInt;
return vtkStdString(ostr.str());
}
if (this->IsLong())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr << this->Data.Long;
return vtkStdString(ostr.str());
}
if (this->IsUnsignedLong())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr << this->Data.UnsignedLong;
return vtkStdString(ostr.str());
@@ -845,14 +845,14 @@ vtkStdString vtkVariant::ToString() const
#if defined(VTK_TYPE_USE___INT64)
if (this->Is__Int64())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr << this->Data.__Int64;
return vtkStdString(ostr.str());
}
if (this->IsUnsigned__Int64())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr << this->Data.Unsigned__Int64;
return vtkStdString(ostr.str());
@@ -861,14 +861,14 @@ vtkStdString vtkVariant::ToString() const
#if defined(VTK_TYPE_USE_LONG_LONG)
if (this->IsLongLong())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr << this->Data.LongLong;
return vtkStdString(ostr.str());
}
if (this->IsUnsignedLongLong())
{
- vtksys_ios::ostringstream ostr;
+ std::ostringstream ostr;
ostr.imbue(std::locale::classic());
ostr << this->Data.UnsignedLongLong;
return vtkStdString(ostr.str());
@@ -973,7 +973,7 @@ template<> float vtkVariantStringToNonFiniteNumeric<float>(vtkStdString str,
template <typename T>
T vtkVariantStringToNumeric(vtkStdString str, bool* valid, T* vtkNotUsed(ignored) = 0)
{
- vtksys_ios::istringstream vstr(str);
+ std::istringstream vstr(str);
T data = 0;
vstr >> data;
if(!vstr.eof())
diff --git a/Common/DataModel/Testing/Cxx/otherCellArray.cxx b/Common/DataModel/Testing/Cxx/otherCellArray.cxx
index 245b102f097580876b33fe3e999fb24ae29c55c1..857eb4a1bf396bb71f1f3adb443417bd48f73527 100644
--- a/Common/DataModel/Testing/Cxx/otherCellArray.cxx
+++ b/Common/DataModel/Testing/Cxx/otherCellArray.cxx
@@ -83,6 +83,6 @@ int TestCellArray(ostream& strm)
int otherCellArray(int,char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
return TestCellArray(vtkmsg_with_warning_C4701);
}
diff --git a/Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx b/Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx
index 40193ed119812f1d2d353f39f1b50b7237a505b8..077165f8ffe4749ff1adf69a38884a9c5159e5ec 100644
--- a/Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx
+++ b/Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx
@@ -495,6 +495,6 @@ int TestOCB(ostream& strm)
int otherCellBoundaries(int, char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
return TestOCB(vtkmsg_with_warning_C4701);
}
diff --git a/Common/DataModel/Testing/Cxx/otherCellPosition.cxx b/Common/DataModel/Testing/Cxx/otherCellPosition.cxx
index 6d31cb20c4d53d653edfadecdff059cf54daad31..ab71edc4ade23354b7f6aadcb8103790318591ae 100644
--- a/Common/DataModel/Testing/Cxx/otherCellPosition.cxx
+++ b/Common/DataModel/Testing/Cxx/otherCellPosition.cxx
@@ -580,6 +580,6 @@ int TestOCP(ostream& strm)
int otherCellPosition(int, char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
return TestOCP(vtkmsg_with_warning_C4701);
}
diff --git a/Common/DataModel/Testing/Cxx/otherColorTransferFunction.cxx b/Common/DataModel/Testing/Cxx/otherColorTransferFunction.cxx
index ce3a9cfd8ee10a8b835d9f09bd8bfb219be2a087..9af80c4d9062f0fbbb4af08b6632f9d4307036ae 100644
--- a/Common/DataModel/Testing/Cxx/otherColorTransferFunction.cxx
+++ b/Common/DataModel/Testing/Cxx/otherColorTransferFunction.cxx
@@ -149,6 +149,6 @@ int Test(ostream& strm)
int otherColorTransferFunction(int, char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
return Test(vtkmsg_with_warning_C4701);
}
diff --git a/Common/DataModel/Testing/Cxx/otherEmptyCell.cxx b/Common/DataModel/Testing/Cxx/otherEmptyCell.cxx
index 8c391537dfc905e4ce441d6078d60471520eaebd..364d091cf4729d4f6cb56b5d251853bca6f3536e 100644
--- a/Common/DataModel/Testing/Cxx/otherEmptyCell.cxx
+++ b/Common/DataModel/Testing/Cxx/otherEmptyCell.cxx
@@ -95,7 +95,7 @@ void TestOEC(ostream& strm)
int otherEmptyCell(int , char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
TestOEC(vtkmsg_with_warning_C4701);
return 0;
diff --git a/Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx b/Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx
index 7e70ae9e127c6a1664c4209538228922bcdfa739..882b99f111f7a3e3f2ef84d1a00df021c9d37ec4 100644
--- a/Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx
+++ b/Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx
@@ -599,6 +599,6 @@ int TestORG(ostream& strm)
int otherRectilinearGrid(int,char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
return TestORG(vtkmsg_with_warning_C4701);
}
diff --git a/Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx b/Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx
index 44ee631ee96d0a98481f05a7eab3bc2d6496c80b..970966178245db37f9a2c50906e8a72165d3bde5 100644
--- a/Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx
+++ b/Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx
@@ -631,6 +631,6 @@ int TestOSG(ostream& strm)
int otherStructuredGrid(int,char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
return TestOSG(vtkmsg_with_warning_C4701);
}
diff --git a/Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx b/Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx
index 0e2ff6a86961a7db338766ca909a9c84bb941f44..52c09474c34f0bd0ac0245533f93c6270dec914b 100644
--- a/Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx
+++ b/Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx
@@ -656,6 +656,6 @@ int TestQE(ostream& strm)
int quadraticEvaluation(int,char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
return TestQE(vtkmsg_with_warning_C4701);
}
diff --git a/Common/DataModel/vtkDirectedAcyclicGraph.cxx b/Common/DataModel/vtkDirectedAcyclicGraph.cxx
index 8e2b936e744a5805c3ef3604fbc7443d27334d75..2f0321087703cb7c68a6d7517c7c0268773ef459 100644
--- a/Common/DataModel/vtkDirectedAcyclicGraph.cxx
+++ b/Common/DataModel/vtkDirectedAcyclicGraph.cxx
@@ -26,9 +26,7 @@
#include "vtkOutEdgeIterator.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/vector>
-
-using vtksys_stl::vector;
+#include <vector>
vtkStandardNewMacro(vtkDirectedAcyclicGraph);
//----------------------------------------------------------------------------
@@ -59,7 +57,7 @@ enum { DFS_WHITE, DFS_GRAY, DFS_BLACK };
static bool vtkDirectedAcyclicGraphDFSVisit(
vtkGraph *g,
vtkIdType u,
- vtksys_stl::vector<int> color,
+ std::vector<int> color,
vtkOutEdgeIterator *adj)
{
color[u] = DFS_GRAY;
@@ -106,7 +104,7 @@ bool vtkDirectedAcyclicGraph::IsStructureValid(vtkGraph *g)
// (from Introduction to Algorithms.
// Cormen, Leiserson, Rivest, p. 486).
vtkIdType numVerts = g->GetNumberOfVertices();
- vector<int> color(numVerts, DFS_WHITE);
+ std::vector<int> color(numVerts, DFS_WHITE);
vtkSmartPointer<vtkOutEdgeIterator> adj =
vtkSmartPointer<vtkOutEdgeIterator>::New();
for (vtkIdType s = 0; s < numVerts; ++s)
diff --git a/Common/DataModel/vtkDirectedGraph.cxx b/Common/DataModel/vtkDirectedGraph.cxx
index b877115fcbddbcd6fb19d25dc1e3afe6a3099487..8632471613367d1123c28205c778a4e1ae035cc6 100644
--- a/Common/DataModel/vtkDirectedGraph.cxx
+++ b/Common/DataModel/vtkDirectedGraph.cxx
@@ -27,7 +27,7 @@
#include "vtkOutEdgeIterator.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/vector>
+#include <vector>
//----------------------------------------------------------------------------
// class vtkDirectedGraph
@@ -68,8 +68,8 @@ bool vtkDirectedGraph::IsStructureValid(vtkGraph *g)
}
// Verify that each edge appears in exactly one in and one out edge list.
- vtksys_stl::vector<bool> in(g->GetNumberOfEdges(), false);
- vtksys_stl::vector<bool> out(g->GetNumberOfEdges(), false);
+ std::vector<bool> in(g->GetNumberOfEdges(), false);
+ std::vector<bool> out(g->GetNumberOfEdges(), false);
vtkSmartPointer<vtkInEdgeIterator> inIter =
vtkSmartPointer<vtkInEdgeIterator>::New();
vtkSmartPointer<vtkOutEdgeIterator> outIter =
diff --git a/Common/DataModel/vtkGraph.cxx b/Common/DataModel/vtkGraph.cxx
index 09682f419391475c5bad305b14f4bd064dec61e1..cf9761495e3cbfc8d5daf5bf8df365fa035e800f 100644
--- a/Common/DataModel/vtkGraph.cxx
+++ b/Common/DataModel/vtkGraph.cxx
@@ -45,9 +45,9 @@
#include "vtkStringArray.h"
#include <cassert>
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/set>
-#include <vtksys/stl/vector>
+#include <algorithm>
+#include <set>
+#include <vector>
double vtkGraph::DefaultPoint[3] = {0, 0, 0};
@@ -59,7 +59,7 @@ class vtkGraphEdgePoints : public vtkObject
public:
static vtkGraphEdgePoints *New();
vtkTypeMacro(vtkGraphEdgePoints, vtkObject);
- vtksys_stl::vector< vtksys_stl::vector<double> > Storage;
+ std::vector< std::vector<double> > Storage;
protected:
vtkGraphEdgePoints() { }
@@ -884,7 +884,7 @@ void vtkGraph::SetEdgePoints(vtkIdType e, vtkIdType npts, double* pts)
{
this->EdgePoints = vtkGraphEdgePoints::New();
}
- vtksys_stl::vector< vtksys_stl::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
+ std::vector< std::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
if (this->EdgePoints->Storage.size() < numEdges)
{
this->EdgePoints->Storage.resize(numEdges);
@@ -922,7 +922,7 @@ void vtkGraph::GetEdgePoints(vtkIdType e, vtkIdType& npts, double*& pts)
pts = 0;
return;
}
- vtksys_stl::vector< vtksys_stl::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
+ std::vector< std::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
if (this->EdgePoints->Storage.size() < numEdges)
{
this->EdgePoints->Storage.resize(numEdges);
@@ -962,7 +962,7 @@ vtkIdType vtkGraph::GetNumberOfEdgePoints(vtkIdType e)
{
return 0;
}
- vtksys_stl::vector< vtksys_stl::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
+ std::vector< std::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
if (this->EdgePoints->Storage.size() < numEdges)
{
this->EdgePoints->Storage.resize(numEdges);
@@ -994,7 +994,7 @@ double* vtkGraph::GetEdgePoint(vtkIdType e, vtkIdType i)
{
this->EdgePoints = vtkGraphEdgePoints::New();
}
- vtksys_stl::vector< vtksys_stl::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
+ std::vector< std::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
if (this->EdgePoints->Storage.size() < numEdges)
{
this->EdgePoints->Storage.resize(numEdges);
@@ -1032,7 +1032,7 @@ void vtkGraph::SetEdgePoint(vtkIdType e, vtkIdType i, double x[3])
{
this->EdgePoints = vtkGraphEdgePoints::New();
}
- vtksys_stl::vector< vtksys_stl::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
+ std::vector< std::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
if (this->EdgePoints->Storage.size() < numEdges)
{
this->EdgePoints->Storage.resize(numEdges);
@@ -1073,7 +1073,7 @@ void vtkGraph::ClearEdgePoints(vtkIdType e)
{
this->EdgePoints = vtkGraphEdgePoints::New();
}
- vtksys_stl::vector< vtksys_stl::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
+ std::vector< std::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
if (this->EdgePoints->Storage.size() < numEdges)
{
this->EdgePoints->Storage.resize(numEdges);
@@ -1104,7 +1104,7 @@ void vtkGraph::AddEdgePoint(vtkIdType e, double x[3])
{
this->EdgePoints = vtkGraphEdgePoints::New();
}
- vtksys_stl::vector< vtksys_stl::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
+ std::vector< std::vector<double> >::size_type numEdges = this->Internals->NumberOfEdges;
if (this->EdgePoints->Storage.size() < numEdges)
{
this->EdgePoints->Storage.resize(numEdges);
@@ -1459,20 +1459,20 @@ void vtkGraph::RemoveVertexInternal(vtkIdType v, bool directed)
}
// Remove connected edges
- vtksys_stl::set<vtkIdType> edges;
- vtksys_stl::vector<vtkOutEdgeType>::iterator oi, oiEnd;
+ std::set<vtkIdType> edges;
+ std::vector<vtkOutEdgeType>::iterator oi, oiEnd;
oiEnd = this->Internals->Adjacency[v].OutEdges.end();
for (oi = this->Internals->Adjacency[v].OutEdges.begin(); oi != oiEnd; ++oi)
{
edges.insert(oi->Id);
}
- vtksys_stl::vector<vtkInEdgeType>::iterator ii, iiEnd;
+ std::vector<vtkInEdgeType>::iterator ii, iiEnd;
iiEnd = this->Internals->Adjacency[v].InEdges.end();
for (ii = this->Internals->Adjacency[v].InEdges.begin(); ii != iiEnd; ++ii)
{
edges.insert(ii->Id);
}
- vtksys_stl::set<vtkIdType>::reverse_iterator ei, eiEnd;
+ std::set<vtkIdType>::reverse_iterator ei, eiEnd;
eiEnd = edges.rend();
for (ei = edges.rbegin(); ei != eiEnd; ++ei)
{
@@ -1505,7 +1505,7 @@ void vtkGraph::RemoveVertexInternal(vtkIdType v, bool directed)
}
else
{
- vtksys_stl::vector<vtkOutEdgeType>::iterator oi2, oi2End;
+ std::vector<vtkOutEdgeType>::iterator oi2, oi2End;
oi2End = this->Internals->Adjacency[oi->Target].OutEdges.end();
for (oi2 = this->Internals->Adjacency[oi->Target].OutEdges.begin(); oi2 != oi2End; ++oi2)
{
@@ -1643,20 +1643,20 @@ void vtkGraph::RemoveVerticesInternal(vtkIdTypeArray* arr, bool directed)
// Sort
vtkIdType* p = arr->GetPointer(0);
vtkIdType numVert = arr->GetNumberOfTuples();
- vtksys_stl::sort(p, p + numVert);
+ std::sort(p, p + numVert);
// Collect all edges to be removed
- vtksys_stl::set<vtkIdType> edges;
+ std::set<vtkIdType> edges;
for (vtkIdType vind = 0; vind < numVert; ++vind)
{
vtkIdType v = p[vind];
- vtksys_stl::vector<vtkOutEdgeType>::iterator oi, oiEnd;
+ std::vector<vtkOutEdgeType>::iterator oi, oiEnd;
oiEnd = this->Internals->Adjacency[v].OutEdges.end();
for (oi = this->Internals->Adjacency[v].OutEdges.begin(); oi != oiEnd; ++oi)
{
edges.insert(oi->Id);
}
- vtksys_stl::vector<vtkInEdgeType>::iterator ii, iiEnd;
+ std::vector<vtkInEdgeType>::iterator ii, iiEnd;
iiEnd = this->Internals->Adjacency[v].InEdges.end();
for (ii = this->Internals->Adjacency[v].InEdges.begin(); ii != iiEnd; ++ii)
{
@@ -1665,7 +1665,7 @@ void vtkGraph::RemoveVerticesInternal(vtkIdTypeArray* arr, bool directed)
}
// Remove edges in reverse index order
- vtksys_stl::set<vtkIdType>::reverse_iterator ei, eiEnd;
+ std::set<vtkIdType>::reverse_iterator ei, eiEnd;
eiEnd = edges.rend();
for (ei = edges.rbegin(); ei != eiEnd; ++ei)
{
@@ -1695,7 +1695,7 @@ void vtkGraph::RemoveEdgesInternal(vtkIdTypeArray* arr, bool directed)
// Sort
vtkIdType* p = arr->GetPointer(0);
vtkIdType numEdges = arr->GetNumberOfTuples();
- vtksys_stl::sort(p, p + numEdges);
+ std::sort(p, p + numEdges);
// Edges vertices in reverse index order
for (vtkIdType eind = numEdges - 1; eind >= 0; --eind)
@@ -1721,8 +1721,8 @@ void vtkGraph::ReorderOutVertices(vtkIdType v, vtkIdTypeArray *vertices)
}
this->ForceOwnership();
- vtksys_stl::vector<vtkOutEdgeType> outEdges;
- vtksys_stl::vector<vtkOutEdgeType>::iterator it, itEnd;
+ std::vector<vtkOutEdgeType> outEdges;
+ std::vector<vtkOutEdgeType>::iterator it, itEnd;
itEnd = this->Internals->Adjacency[index].OutEdges.end();
for (vtkIdType i = 0; i < vertices->GetNumberOfTuples(); ++i)
{
diff --git a/Common/DataModel/vtkGraphInternals.cxx b/Common/DataModel/vtkGraphInternals.cxx
index 30f9408cc811c80dd6e1559f6b885a57269c60f3..a77f4455c64cacaba421e61009e76dbaba2e28b0 100644
--- a/Common/DataModel/vtkGraphInternals.cxx
+++ b/Common/DataModel/vtkGraphInternals.cxx
@@ -37,7 +37,7 @@ vtkGraphInternals::~vtkGraphInternals()
}
//----------------------------------------------------------------------------
-void vtkGraphInternals::RemoveEdgeFromOutList(vtkIdType e, vtksys_stl::vector<vtkOutEdgeType>& outEdges)
+void vtkGraphInternals::RemoveEdgeFromOutList(vtkIdType e, std::vector<vtkOutEdgeType>& outEdges)
{
size_t outSize = outEdges.size();
size_t i = 0;
@@ -58,7 +58,7 @@ void vtkGraphInternals::RemoveEdgeFromOutList(vtkIdType e, vtksys_stl::vector<vt
}
//----------------------------------------------------------------------------
-void vtkGraphInternals::RemoveEdgeFromInList(vtkIdType e, vtksys_stl::vector<vtkInEdgeType>& inEdges)
+void vtkGraphInternals::RemoveEdgeFromInList(vtkIdType e, std::vector<vtkInEdgeType>& inEdges)
{
size_t inSize = inEdges.size();
size_t i = 0;
@@ -79,7 +79,7 @@ void vtkGraphInternals::RemoveEdgeFromInList(vtkIdType e, vtksys_stl::vector<vtk
}
//----------------------------------------------------------------------------
-void vtkGraphInternals::ReplaceEdgeFromOutList(vtkIdType from, vtkIdType to, vtksys_stl::vector<vtkOutEdgeType>& outEdges)
+void vtkGraphInternals::ReplaceEdgeFromOutList(vtkIdType from, vtkIdType to, std::vector<vtkOutEdgeType>& outEdges)
{
size_t outSize = outEdges.size();
for (size_t i = 0; i < outSize; ++i)
@@ -92,7 +92,7 @@ void vtkGraphInternals::ReplaceEdgeFromOutList(vtkIdType from, vtkIdType to, vtk
}
//----------------------------------------------------------------------------
-void vtkGraphInternals::ReplaceEdgeFromInList(vtkIdType from, vtkIdType to, vtksys_stl::vector<vtkInEdgeType>& inEdges)
+void vtkGraphInternals::ReplaceEdgeFromInList(vtkIdType from, vtkIdType to, std::vector<vtkInEdgeType>& inEdges)
{
size_t inSize = inEdges.size();
for (size_t i = 0; i < inSize; ++i)
diff --git a/Common/DataModel/vtkGraphInternals.h b/Common/DataModel/vtkGraphInternals.h
index eb27618efebf3e683a8c6bc21c3bb7e582686714..a7a4aaf77c64f1967bce2f1948b76dbe046e7d83 100644
--- a/Common/DataModel/vtkGraphInternals.h
+++ b/Common/DataModel/vtkGraphInternals.h
@@ -28,8 +28,8 @@
#include "vtkCommonDataModelModule.h" // For export macro
#include "vtkGraph.h"
-#include <vtksys/stl/vector> // STL Header
-#include <vtksys/stl/map> // STL Header
+#include <vector> // STL Header
+#include <map> // STL Header
//----------------------------------------------------------------------------
// class vtkVertexAdjacencyList
@@ -38,8 +38,8 @@
class vtkVertexAdjacencyList
{
public:
- vtksys_stl::vector<vtkInEdgeType> InEdges;
- vtksys_stl::vector<vtkOutEdgeType> OutEdges;
+ std::vector<vtkInEdgeType> InEdges;
+ std::vector<vtkOutEdgeType> OutEdges;
};
//ETX
@@ -52,7 +52,7 @@ public:
static vtkGraphInternals *New();
//BTX
vtkTypeMacro(vtkGraphInternals, vtkObject);
- vtksys_stl::vector<vtkVertexAdjacencyList> Adjacency;
+ std::vector<vtkVertexAdjacencyList> Adjacency;
//ETX
vtkIdType NumberOfEdges;
@@ -70,19 +70,19 @@ public:
//BTX
// Description:
// Convenience method for removing an edge from an out edge list.
- void RemoveEdgeFromOutList(vtkIdType e, vtksys_stl::vector<vtkOutEdgeType>& outEdges);
+ void RemoveEdgeFromOutList(vtkIdType e, std::vector<vtkOutEdgeType>& outEdges);
// Description:
// Convenience method for removing an edge from an in edge list.
- void RemoveEdgeFromInList(vtkIdType e, vtksys_stl::vector<vtkInEdgeType>& inEdges);
+ void RemoveEdgeFromInList(vtkIdType e, std::vector<vtkInEdgeType>& inEdges);
// Description:
// Convenience method for renaming an edge in an out edge list.
- void ReplaceEdgeFromOutList(vtkIdType from, vtkIdType to, vtksys_stl::vector<vtkOutEdgeType>& outEdges);
+ void ReplaceEdgeFromOutList(vtkIdType from, vtkIdType to, std::vector<vtkOutEdgeType>& outEdges);
// Description:
// Convenience method for renaming an edge in an in edge list.
- void ReplaceEdgeFromInList(vtkIdType from, vtkIdType to, vtksys_stl::vector<vtkInEdgeType>& inEdges);
+ void ReplaceEdgeFromInList(vtkIdType from, vtkIdType to, std::vector<vtkInEdgeType>& inEdges);
//ETX
protected:
diff --git a/Common/DataModel/vtkQuadratureSchemeDefinition.cxx b/Common/DataModel/vtkQuadratureSchemeDefinition.cxx
index ab512c700800a59531240bb0babb2f52c7fe6fce..be60c7818b888bd180facae0b102708f4b646669 100644
--- a/Common/DataModel/vtkQuadratureSchemeDefinition.cxx
+++ b/Common/DataModel/vtkQuadratureSchemeDefinition.cxx
@@ -21,8 +21,8 @@
#include "vtkCellType.h"
#include "vtkXMLDataElement.h"
#include "vtksys/ios/sstream"
-using vtksys_ios::ostringstream;
-using vtksys_ios::istringstream;
+using std::ostringstream;
+using std::istringstream;
#include <string>
using std::string;
diff --git a/Common/DataModel/vtkTree.cxx b/Common/DataModel/vtkTree.cxx
index 3dd048ea025bf578fddc2af16c2a11a8a4c12c49..25d7738e92fb778f2cc2ca01850305fb5b53b4f5 100644
--- a/Common/DataModel/vtkTree.cxx
+++ b/Common/DataModel/vtkTree.cxx
@@ -26,9 +26,7 @@
#include "vtkOutEdgeIterator.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/vector>
-
-using vtksys_stl::vector;
+#include <vector>
vtkStandardNewMacro(vtkTree);
//----------------------------------------------------------------------------
@@ -172,8 +170,8 @@ bool vtkTree::IsStructureValid(vtkGraph *g)
}
// Make sure the tree is connected with no cycles.
- vector<bool> visited(g->GetNumberOfVertices(), false);
- vector<vtkIdType> stack;
+ std::vector<bool> visited(g->GetNumberOfVertices(), false);
+ std::vector<vtkIdType> stack;
stack.push_back(root);
vtkSmartPointer<vtkOutEdgeIterator> outIter =
vtkSmartPointer<vtkOutEdgeIterator>::New();
diff --git a/Common/DataModel/vtkUndirectedGraph.cxx b/Common/DataModel/vtkUndirectedGraph.cxx
index 776ee91d64dbb7c797bf8dfaf92b4d3c189d8a4c..f80407155c5a26e75689173c2600224f80ad7d26 100644
--- a/Common/DataModel/vtkUndirectedGraph.cxx
+++ b/Common/DataModel/vtkUndirectedGraph.cxx
@@ -26,7 +26,7 @@
#include "vtkOutEdgeIterator.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/vector>
+#include <vector>
//----------------------------------------------------------------------------
// class vtkUndirectedGraph
@@ -92,8 +92,8 @@ bool vtkUndirectedGraph::IsStructureValid(vtkGraph *g)
// Verify that there are no in edges and that each edge
// appears in exactly two edge lists.
// Loop edges should be in exactly one edge list.
- vtksys_stl::vector<vtkIdType> place(g->GetNumberOfEdges(), -1);
- vtksys_stl::vector<vtkIdType> count(g->GetNumberOfEdges(), 0);
+ std::vector<vtkIdType> place(g->GetNumberOfEdges(), -1);
+ std::vector<vtkIdType> count(g->GetNumberOfEdges(), 0);
vtkSmartPointer<vtkOutEdgeIterator> outIter =
vtkSmartPointer<vtkOutEdgeIterator>::New();
for (vtkIdType v = 0; v < g->GetNumberOfVertices(); ++v)
diff --git a/Common/DataModel/vtkXMLDataElement.cxx b/Common/DataModel/vtkXMLDataElement.cxx
index 84f696dd11025d9023be5700cfabe1960bc8e4ec..54c6877f813195db20c3ab663dbdee1e12a2f97b 100644
--- a/Common/DataModel/vtkXMLDataElement.cxx
+++ b/Common/DataModel/vtkXMLDataElement.cxx
@@ -18,8 +18,8 @@
#include <ctype.h>
#include <vtksys/ios/sstream>
-using vtksys_ios::ostringstream;
-using vtksys_ios::istringstream;
+using std::ostringstream;
+using std::istringstream;
#include <vtksys/SystemTools.hxx>
#include <string>
using std::string;
@@ -754,7 +754,7 @@ template <class T>
int vtkXMLDataElementVectorAttributeParse(const char* str, int length, T* data)
{
if(!str || !length || !data) { return 0; }
- vtksys_ios::stringstream vstr;
+ std::stringstream vstr;
vstr.imbue(std::locale::classic());
vstr << str;
int i;
@@ -1037,7 +1037,7 @@ void vtkXMLDataElementVectorAttributeSet(vtkXMLDataElement *elem, const char* na
{
return;
}
- vtksys_ios::stringstream vstr;
+ std::stringstream vstr;
vstr.imbue(std::locale::classic());
vstr << data[0];
for(int i = 1; i < length; ++i)
diff --git a/Common/ExecutionModel/vtkExecutive.cxx b/Common/ExecutionModel/vtkExecutive.cxx
index b067f5a94c16405481c01a603c9a4722cbc053d1..1669a1fa4d79fdc8126c9b4e547bb6309fa6e930 100644
--- a/Common/ExecutionModel/vtkExecutive.cxx
+++ b/Common/ExecutionModel/vtkExecutive.cxx
@@ -795,7 +795,7 @@ int vtkExecutive::CheckAlgorithm(const char* method,
{
if(request)
{
- vtksys_ios::ostringstream rqmsg;
+ std::ostringstream rqmsg;
request->Print(rqmsg);
vtkErrorMacro(<< method << " invoked during another request. "
"Returning failure to algorithm "
diff --git a/Common/System/Testing/Cxx/otherTimerLog.cxx b/Common/System/Testing/Cxx/otherTimerLog.cxx
index 8df79658c686af4812ce567ff30c48f570933db4..c9cdd3d9305c86532d5a1fd3f6eb237406a5add4 100644
--- a/Common/System/Testing/Cxx/otherTimerLog.cxx
+++ b/Common/System/Testing/Cxx/otherTimerLog.cxx
@@ -70,7 +70,7 @@ void otherTimerLogTest(ostream& strm)
int otherTimerLog(int,char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
otherTimerLogTest(vtkmsg_with_warning_C4701);
return 0;
diff --git a/Deprecated/vtkGraphHierarchicalBundle.cxx b/Deprecated/vtkGraphHierarchicalBundle.cxx
index 1633d57f8deee34ed792ec85248759578e029098..0805e34422f7cd5b15f1eb22ff9af35538e5481b 100644
--- a/Deprecated/vtkGraphHierarchicalBundle.cxx
+++ b/Deprecated/vtkGraphHierarchicalBundle.cxx
@@ -35,8 +35,7 @@
#include "vtkTree.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/map>
-using vtksys_stl::map;
+#include <map>
//---------------------------------------------------------------------------
template <typename T>
@@ -110,7 +109,7 @@ int vtkGraphHierarchicalBundle::RequestData(
// Create a map from graph indices to tree indices
// If we are using DirectMapping this is trivial
// we just create an identity map
- map<vtkIdType, vtkIdType> graphIndexToTreeIndex;
+ std::map<vtkIdType, vtkIdType> graphIndexToTreeIndex;
if (this->DirectMapping)
{
if (graph->GetNumberOfVertices() > tree->GetNumberOfVertices())
@@ -146,7 +145,7 @@ int vtkGraphHierarchicalBundle::RequestData(
return 0;
}
- map<vtkVariant,vtkIdType,vtkVariantLessThan> graphIdMap;
+ std::map<vtkVariant,vtkIdType,vtkVariantLessThan> graphIdMap;
// Create a map from graph id to graph index
for (int i=0; i<graph->GetNumberOfVertices(); ++i)
diff --git a/Examples/Array/Cxx/IdentityMatrix.cxx b/Examples/Array/Cxx/IdentityMatrix.cxx
index a275b0e818372356c2d0eddf324bb42de730a429..ca5d1d180290594ac3924bd567d20a2c3a714207 100644
--- a/Examples/Array/Cxx/IdentityMatrix.cxx
+++ b/Examples/Array/Cxx/IdentityMatrix.cxx
@@ -12,7 +12,7 @@ int main(int argc, char* argv[])
}
int size = 0;
- vtksys_ios::istringstream buffer(argv[1]);
+ std::istringstream buffer(argv[1]);
buffer >> size;
if(size < 1)
diff --git a/Examples/HyperTree/Cxx/HyperTreeGridDemonstrator.cxx b/Examples/HyperTree/Cxx/HyperTreeGridDemonstrator.cxx
index 3645574cba8ee41c91adba3d7a4156ea0d9f0cdb..2ad5dd80d91bdb36fd109483f2b3c315a4d0ca41 100644
--- a/Examples/HyperTree/Cxx/HyperTreeGridDemonstrator.cxx
+++ b/Examples/HyperTree/Cxx/HyperTreeGridDemonstrator.cxx
@@ -119,7 +119,7 @@ void SetInputParameters( int& dim,
}
// Initialize character stream
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
// Seed random number generator
vtkMath::RandomSeed( static_cast<int>( vtkTimerLog::GetUniversalTime() ) );
diff --git a/Examples/Infovis/Cxx/MultiView.cxx b/Examples/Infovis/Cxx/MultiView.cxx
index c05e95aeb6d7d45b8e35c55916aaddfa2ecbe999..2fb3b12befb9b5f05cf49bf1e36b70c0e6b5792f 100644
--- a/Examples/Infovis/Cxx/MultiView.cxx
+++ b/Examples/Infovis/Cxx/MultiView.cxx
@@ -29,7 +29,7 @@
#include "vtkTree.h"
#include "vtkViewTheme.h"
-#include <vtksys/stl/vector>
+#include <vector>
class ViewUpdater : public vtkCommand
{
@@ -53,7 +53,7 @@ public:
private:
ViewUpdater() { }
~ViewUpdater() { }
- vtksys_stl::vector<vtkView*> Views;
+ std::vector<vtkView*> Views;
};
int main(int, char*[])
diff --git a/Examples/Medical/Cxx/GenerateCubesFromLabels.cxx b/Examples/Medical/Cxx/GenerateCubesFromLabels.cxx
index 3424a7a6e6b3f1bc14afae5a9d33d6a46261b4dd..16a4211448b3368399ae9312fec2eaa9535d1bb7 100644
--- a/Examples/Medical/Cxx/GenerateCubesFromLabels.cxx
+++ b/Examples/Medical/Cxx/GenerateCubesFromLabels.cxx
@@ -25,7 +25,7 @@
#include <vtkPointData.h>
#include <vtkCellData.h>
#include <vtkUnstructuredGrid.h>
-#include <vtksys/ios/sstream>
+#include <sstream>
int main (int argc, char *argv[])
{
@@ -123,7 +123,7 @@ int main (int argc, char *argv[])
selector->ThresholdBetween(i, i);
// output the polydata
- vtksys_stl::stringstream ss;
+ std::stringstream ss;
ss << filePrefix << i << ".vtp";
cout << argv[0] << " writing " << ss.str() << endl;
diff --git a/Examples/Medical/Cxx/GenerateModelsFromLabels.cxx b/Examples/Medical/Cxx/GenerateModelsFromLabels.cxx
index 8cd37556ebc216ebcc9442ab0216630a4bca5de3..1067d18f57965e79bdfbe9b263b216a7bba7b5e1 100644
--- a/Examples/Medical/Cxx/GenerateModelsFromLabels.cxx
+++ b/Examples/Medical/Cxx/GenerateModelsFromLabels.cxx
@@ -23,7 +23,7 @@
#include <vtkImageData.h>
#include <vtkPointData.h>
#include <vtkUnstructuredGrid.h>
-#include <vtksys/ios/sstream>
+#include <sstream>
int main (int argc, char *argv[])
{
@@ -118,7 +118,7 @@ int main (int argc, char *argv[])
selector->ThresholdBetween(i, i);
// output the polydata
- vtksys_stl::stringstream ss;
+ std::stringstream ss;
ss << filePrefix << i << ".vtp";
cout << argv[0] << " writing " << ss.str() << endl;
diff --git a/Examples/MultiBlock/Cxx/MultiBlock.cxx b/Examples/MultiBlock/Cxx/MultiBlock.cxx
index 25616f0d8beef286fff8b7bd90908aca356815ea..fb944c75db4ebddc60373f75a27637f7e229f89d 100644
--- a/Examples/MultiBlock/Cxx/MultiBlock.cxx
+++ b/Examples/MultiBlock/Cxx/MultiBlock.cxx
@@ -66,7 +66,7 @@ int main(int argc, char* argv[])
{
// Here we load the three separate files (each containing
// a structured grid dataset)
- vtksys_ios::ostringstream fname;
+ std::ostringstream fname;
fname << "Data/multicomb_" << i << ".vts" << ends;
char* cfname =
vtkTestUtilities::ExpandDataFileName(argc, argv, fname.str().c_str());
diff --git a/Examples/Statistics/ExampleKMeansStatistics.cxx b/Examples/Statistics/ExampleKMeansStatistics.cxx
index 1fd162d7cd1908edf142984da38d03067f11379e..42e21feefa52bc04bff9225c98a55f23f38e79de 100644
--- a/Examples/Statistics/ExampleKMeansStatistics.cxx
+++ b/Examples/Statistics/ExampleKMeansStatistics.cxx
@@ -41,7 +41,7 @@ int main( int, char *[] )
int numComponents = 1;
for ( int c = 0; c < nDim; ++ c )
{
- vtksys_ios::ostringstream colName;
+ std::ostringstream colName;
colName << "coord " << c;
doubleArray = vtkDoubleArray::New();
doubleArray->SetNumberOfComponents( numComponents );
@@ -80,7 +80,7 @@ int main( int, char *[] )
for ( int c = 0; c < 5; ++ c )
{
- vtksys_ios::ostringstream colName;
+ std::ostringstream colName;
colName << "coord " << c;
paramArray = vtkDoubleArray::New();
paramArray->SetNumberOfComponents( numComponents );
diff --git a/Filters/Extraction/Testing/Cxx/TestConvertSelection.cxx b/Filters/Extraction/Testing/Cxx/TestConvertSelection.cxx
index a14732de7b2ff90ce48530201559fc4839436f94..35e41382478d2f450f068d5d86cf9415ad006950 100644
--- a/Filters/Extraction/Testing/Cxx/TestConvertSelection.cxx
+++ b/Filters/Extraction/Testing/Cxx/TestConvertSelection.cxx
@@ -34,7 +34,7 @@
#define VTK_CREATE(type,name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
-#include <vtksys/stl/map>
+#include <map>
template <typename T>
int CompareArrays(T* a, T* b, vtkIdType n)
@@ -129,7 +129,7 @@ int CompareSelections(vtkSelectionNode* a, vtkSelectionNode* b)
}
int TestConvertSelectionType(
- vtksys_stl::map<int, vtkSmartPointer<vtkSelection> >& selMap,
+ std::map<int, vtkSmartPointer<vtkSelection> >& selMap,
vtkDataObject* data,
int inputType,
int outputType,
@@ -184,7 +184,7 @@ void GraphConvertSelections(int & errors, int size)
g->AddEdge(i, i);
}
- vtksys_stl::map<int, vtkSmartPointer<vtkSelection> > selMap;
+ std::map<int, vtkSmartPointer<vtkSelection> > selMap;
VTK_CREATE(vtkSelection, globalIdsSelection);
VTK_CREATE(vtkSelectionNode, globalIdsSelectionNode);
@@ -387,7 +387,7 @@ void PolyDataConvertSelections(int & errors, int size)
}
g->SetLines(newLines);
- vtksys_stl::map<int, vtkSmartPointer<vtkSelection> > selMap;
+ std::map<int, vtkSmartPointer<vtkSelection> > selMap;
VTK_CREATE(vtkSelection, globalIdsSelection);
VTK_CREATE(vtkSelectionNode, globalIdsSelectionNode);
diff --git a/Filters/Extraction/vtkExtractArraysOverTime.cxx b/Filters/Extraction/vtkExtractArraysOverTime.cxx
index 334e4aff91cecd850df179decb296ae0b5f39c54..a9badaf162b6d26d7e6a2cadea7851addf30baac 100644
--- a/Filters/Extraction/vtkExtractArraysOverTime.cxx
+++ b/Filters/Extraction/vtkExtractArraysOverTime.cxx
@@ -307,7 +307,7 @@ void vtkExtractArraysOverTime::vtkInternal::AddTimeStepInternalForLocations(
if (value->Label.empty())
{
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
stream << "(" << point[0] << ", " << point[1] << ", " << point[2] << ")";
value->Label = stream.str();
}
@@ -532,7 +532,7 @@ void vtkExtractArraysOverTime::vtkInternal::AddTimeStepInternalForQuery(
// Determine the label to use for this block if none exists.
if (value->Label.empty())
{
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
if (value->Label.empty())
{
if (composite_index != 0)
@@ -644,7 +644,7 @@ void vtkExtractArraysOverTime::vtkInternal::AddTimeStepInternal(
// assigned.
if (value->Label.empty())
{
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
if (this->ContentType == vtkSelectionNode::GLOBALIDS)
{
vtkIdTypeArray* gidsArray = vtkIdTypeArray::SafeDownCast(
diff --git a/Filters/General/vtkQuadraturePointInterpolator.cxx b/Filters/General/vtkQuadraturePointInterpolator.cxx
index 2d5d4ca56a0f5470d28858a79f07b7fd090192e2..870eea3ef5b6f57b712f7fc289bed586a0301a0e 100644
--- a/Filters/General/vtkQuadraturePointInterpolator.cxx
+++ b/Filters/General/vtkQuadraturePointInterpolator.cxx
@@ -35,7 +35,7 @@
#include "vtkObjectFactory.h"
#include "vtksys/ios/sstream"
-using vtksys_ios::ostringstream;
+using std::ostringstream;
#include "vtkQuadraturePointsUtilities.hxx"
diff --git a/Filters/General/vtkQuadraturePointsGenerator.cxx b/Filters/General/vtkQuadraturePointsGenerator.cxx
index 9fed54031e9b31951374586b30964597a6669fc4..56123a1377cd43ac30ca83d8c1d34bb4f9afaf33 100644
--- a/Filters/General/vtkQuadraturePointsGenerator.cxx
+++ b/Filters/General/vtkQuadraturePointsGenerator.cxx
@@ -38,7 +38,7 @@
#include "vtkQuadraturePointsUtilities.hxx"
#include "vtksys/ios/sstream"
-using vtksys_ios::ostringstream;
+using std::ostringstream;
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkQuadraturePointsGenerator);
diff --git a/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx
index ea3171952518ef8cb1650ca51776d177d8df6264..c2ed583f471188ef2b89f222904fac764d9c399d 100644
--- a/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx
+++ b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx
@@ -36,7 +36,7 @@
#include <vtksys/ios/sstream>
#include <string>
#include "vtkSmartPointer.h"
-using vtksys_ios::ostringstream;
+using std::ostringstream;
using std::string;
// Here are some default shape functions weights which
diff --git a/Filters/Generic/Testing/Cxx/otherCreation.cxx b/Filters/Generic/Testing/Cxx/otherCreation.cxx
index d045fe2dab5544c47c925264534ca3be2859edc0..d2080038e9a6a655b6a5f589c49322d1d1bfeb74 100644
--- a/Filters/Generic/Testing/Cxx/otherCreation.cxx
+++ b/Filters/Generic/Testing/Cxx/otherCreation.cxx
@@ -604,7 +604,7 @@ int TestWithPointsAndCells(ostream &strm)
int i;
int count;
std::string s;
- vtksys_ios::ostringstream ost;
+ std::ostringstream ost;
vtkGenericAdaptorCell *cab=0;
while(itNum<itCount)
@@ -1126,7 +1126,7 @@ int TestWithPointsAndCellsAndPointData(ostream &strm)
int i;
int count;
std::string s;
- vtksys_ios::ostringstream ost;
+ std::ostringstream ost;
vtkGenericAdaptorCell *cab;
while(itNum<itCount)
@@ -1680,7 +1680,7 @@ int TestWithPointsAndCellsAndPointData(ostream &strm)
int otherCreation(int vtkNotUsed(argc),
char *vtkNotUsed(argv)[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
if (TestEmpty(cout))
{
diff --git a/Filters/Hybrid/vtkFacetReader.cxx b/Filters/Hybrid/vtkFacetReader.cxx
index e77d43d05870a91d662abe6d60f4052f1095053e..a8c697378fbfaf985b66a9c596ef31e56f7e8481 100644
--- a/Filters/Hybrid/vtkFacetReader.cxx
+++ b/Filters/Hybrid/vtkFacetReader.cxx
@@ -316,7 +316,7 @@ int vtkFacetReader::RequestData(
char* strPtr = &(*stringBuffer.begin());
strcpy(strPtr, line.c_str());
std::string str(strPtr, stringBuffer.size());
- vtksys_ios::istringstream lineStream(str);
+ std::istringstream lineStream(str);
vtkIdType kk;
int material = -1, relativePartNumber = -1;
for ( kk = 0; kk < num_points_per_cell; kk ++ )
diff --git a/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx b/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx
index 2081aebb65b1c315dcab5697d230bcd43e80ca67..f78f5c97caaa89b9b1475b55091fcdc57f6488e4 100644
--- a/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx
+++ b/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx
@@ -42,7 +42,7 @@ namespace
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx b/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx
index 83dfc5681ccf09610d394b4edaf449831918d4da..3e9033ee8de757d64cfd316e3a2d9d9281c1b031 100644
--- a/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx
+++ b/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx
@@ -39,7 +39,7 @@ namespace
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Filters/Modeling/vtkQuadRotationalExtrusionFilter.cxx b/Filters/Modeling/vtkQuadRotationalExtrusionFilter.cxx
index 81baea86e7810774cbb45e70376e3d3f192f9ab1..08c7e32ebd1be3b42d6eb4cda49f10a2566127dd 100644
--- a/Filters/Modeling/vtkQuadRotationalExtrusionFilter.cxx
+++ b/Filters/Modeling/vtkQuadRotationalExtrusionFilter.cxx
@@ -184,7 +184,7 @@ int vtkQuadRotationalExtrusionFilter::RequestData( vtkInformation* vtkNotUsed( r
return 0;
}
- vtksys_stl::map<int,vtkDataSet*> outputBlocks;
+ std::map<int,vtkDataSet*> outputBlocks;
vtkDebugMacro(<<"input="<<compositeInput->GetClassName()<<"\n");
@@ -212,7 +212,7 @@ int vtkQuadRotationalExtrusionFilter::RequestData( vtkInformation* vtkNotUsed( r
double blockAngle = this->GetDefaultAngle();
vtkDebugMacro(<<"DefaultAngle="<<blockAngle<<"\n");
- vtksys_stl::map<vtkIdType,double>::iterator amit = this->PerBlockAngles.find( blockId );
+ std::map<vtkIdType,double>::iterator amit = this->PerBlockAngles.find( blockId );
if( amit != this->PerBlockAngles.end() )
{
vtkDebugMacro(<<"Found angle "<<amit->second<<" for block "<<blockId<<"\n");
@@ -503,7 +503,7 @@ int vtkQuadRotationalExtrusionFilter::RequestData( vtkInformation* vtkNotUsed( r
// build final composite output. also tagging blocks with their associated Id
compositeOutput->SetNumberOfBlocks( static_cast<unsigned int>( outputBlocks.size() ) );
int blockIndex=0;
- for( vtksys_stl::map<int,vtkDataSet*>::iterator it=outputBlocks.begin(); it!=outputBlocks.end(); ++it, ++blockIndex )
+ for( std::map<int,vtkDataSet*>::iterator it=outputBlocks.begin(); it!=outputBlocks.end(); ++it, ++blockIndex )
{
if( it->second->GetNumberOfCells() > 0 )
{
@@ -543,7 +543,7 @@ void vtkQuadRotationalExtrusionFilter::PrintSelf( ostream& os, vtkIndent indent
os << indent << "Translation: " << this->Translation << "\n";
os << indent << "Delta Radius: " << this->DeltaRadius << "\n";
os << indent << "PerBlockAngles:\n";
- for( vtksys_stl::map<vtkIdType,double>::iterator it=this->PerBlockAngles.begin();it!=this->PerBlockAngles.end();++it )
+ for( std::map<vtkIdType,double>::iterator it=this->PerBlockAngles.begin();it!=this->PerBlockAngles.end();++it )
{
os << indent.GetNextIndent() << "Block #" << it->first << " -> " << it->second << "\n";
}
diff --git a/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h b/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h
index a281a2b1c53da67e04f3cd5f785017221cc2df04..966a0010669bd2f1d8d5fe47a3f2b8fea9f502a3 100644
--- a/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h
+++ b/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h
@@ -60,7 +60,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkFiltersModelingModule.h" // For export macro
#include "vtkMultiBlockDataSetAlgorithm.h"
-#include <vtksys/stl/map> // STL vector need for per block angles
+#include <map> // STL vector need for per block angles
class vtkPoints;
class vtkPointData;
@@ -149,7 +149,7 @@ class VTKFILTERSMODELING_EXPORT vtkQuadRotationalExtrusionFilter : public vtkMul
double DeltaRadius;
//BTX
- vtksys_stl::map<vtkIdType,double> PerBlockAngles;
+ std::map<vtkIdType,double> PerBlockAngles;
//ETX
private:
diff --git a/Filters/Parallel/vtkCollectGraph.cxx b/Filters/Parallel/vtkCollectGraph.cxx
index bea22bee1ae7c00ac8eb5f1fe6cf60a1f137c76d..96fb9151e0058b854e404f1ed272bd540832c1ee 100644
--- a/Filters/Parallel/vtkCollectGraph.cxx
+++ b/Filters/Parallel/vtkCollectGraph.cxx
@@ -37,13 +37,9 @@
#include "vtkStringArray.h"
#include "vtkVariant.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
-
-using vtksys_stl::map;
-using vtksys_stl::pair;
-using vtksys_stl::vector;
+#include <map>
+#include <utility>
+#include <vector>
vtkStandardNewMacro(vtkCollectGraph);
@@ -231,11 +227,11 @@ int vtkCollectGraph::RequestData(
char *idFieldName = ids->GetName();
// Map from global ids (owner, ownerId pairs) to wholeGraph ids.
- map<int, vtkIdType> globalIdMapInt;
- map<vtkStdString, vtkIdType> globalIdMapStr;
+ std::map<int, vtkIdType> globalIdMapInt;
+ std::map<vtkStdString, vtkIdType> globalIdMapStr;
// Map from curGraph ids to wholeGraph ids.
- vector<vtkIdType> localIdVec;
+ std::vector<vtkIdType> localIdVec;
// Edge iterator.
vtkSmartPointer<vtkEdgeListIterator> edges =
diff --git a/Filters/ParallelStatistics/Testing/Cxx/TestRandomPKMeansStatisticsMPI.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPKMeansStatisticsMPI.cxx
index f3b61a86c83508d8e873ea547df52416fe9aecf2..bc211ef371c8c94749f522afafada8809f0648f4 100644
--- a/Filters/ParallelStatistics/Testing/Cxx/TestRandomPKMeansStatisticsMPI.cxx
+++ b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPKMeansStatisticsMPI.cxx
@@ -40,8 +40,8 @@
#include "vtksys/CommandLineArguments.hxx"
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/vector>
+#include <sstream>
+#include <vector>
namespace
{
@@ -76,10 +76,10 @@ void RandomSampleStatistics( vtkMultiProcessController* controller, void* arg )
// Generate column names
int nVariables = args->nVariables;
- vtksys_stl::vector<vtkStdString> columnNames;
+ std::vector<vtkStdString> columnNames;
for ( int v = 0; v < nVariables; ++ v )
{
- vtksys_ios::ostringstream columnName;
+ std::ostringstream columnName;
columnName << "Variable " << v;
columnNames.push_back( columnName.str() );
}
diff --git a/Filters/ParallelStatistics/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx
index 7b57288a9f644be04e771c3734ce6b3d0761b8c2..5c87fa4b38a520a88c99655603692b7ed9211bbd 100644
--- a/Filters/ParallelStatistics/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx
+++ b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx
@@ -393,7 +393,7 @@ void RandomSampleStatistics( vtkMultiProcessController* controller, void* arg )
for ( int c = 0; c < nNormal; ++ c )
{
// Use assessed values (relative deviations) to check distribution
- vtksys_ios::ostringstream relDevName;
+ std::ostringstream relDevName;
relDevName << "d(Standard Normal "
<< c
<< ")";
diff --git a/Filters/ParallelStatistics/Testing/Cxx/TestRandomPOrderStatisticsMPI.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPOrderStatisticsMPI.cxx
index b03137ea7467df589fd7db3e4f91c467e7375805..7e097c100ed0ee2688015522bc19ff8db9b61566 100644
--- a/Filters/ParallelStatistics/Testing/Cxx/TestRandomPOrderStatisticsMPI.cxx
+++ b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPOrderStatisticsMPI.cxx
@@ -40,6 +40,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkVariantArray.h"
#include "vtksys/CommandLineArguments.hxx"
+#include <map>
namespace
{
@@ -79,7 +80,7 @@ void RandomOrderStatistics( vtkMultiProcessController* controller, void* arg )
// Infer number and type of generated variables based on command line options
int nVariables = 0;
- vtksys_stl::map<int,bool> isVariableAString;
+ std::map<int,bool> isVariableAString;
if ( ! args->skipInt )
{
isVariableAString[nVariables] = false;
diff --git a/Filters/ParallelStatistics/Testing/Cxx/TestRealDataPDescriptiveStatisticsMPI.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestRealDataPDescriptiveStatisticsMPI.cxx
index 51a8e3324991af8499efcf052380acf6698c84b6..14154db0b1bd361f2d25bda1b3c2ef06073ef640 100644
--- a/Filters/ParallelStatistics/Testing/Cxx/TestRealDataPDescriptiveStatisticsMPI.cxx
+++ b/Filters/ParallelStatistics/Testing/Cxx/TestRealDataPDescriptiveStatisticsMPI.cxx
@@ -38,6 +38,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkVariantArray.h"
#include "vtksys/CommandLineArguments.hxx"
+#include <vector>
namespace
{
@@ -474,8 +475,8 @@ int TestRealDataPDescriptiveStatisticsMPI( int argc, char* argv[] )
// Set default argument values (some of which are invalid, for mandatory parameters)
vtkStdString fileName= "";
- vtksys_stl::vector<int> dataDim;
- vtksys_stl::vector<int> procDim;
+ std::vector<int> dataDim;
+ std::vector<int> procDim;
// Initialize command line argument parser
vtksys::CommandLineArguments clArgs;
diff --git a/Filters/Selection/Testing/Cxx/TestCellDistanceSelector2D.cxx b/Filters/Selection/Testing/Cxx/TestCellDistanceSelector2D.cxx
index 23f5fe9d9d52d2c49a7079a2d50382df8c83f06a..6c7787bb1a07d16317162d1da7c006bd999eabf2 100644
--- a/Filters/Selection/Testing/Cxx/TestCellDistanceSelector2D.cxx
+++ b/Filters/Selection/Testing/Cxx/TestCellDistanceSelector2D.cxx
@@ -101,7 +101,7 @@ static int CheckExtractedUGrid( vtkExtractSelection* extract,
// If requested, write mesh
if ( writeGrid )
{
- vtksys_ios::ostringstream fileNameSS;
+ std::ostringstream fileNameSS;
fileNameSS << "./CellDistanceExtraction2D-"
<< testIdx
<< ".vtk";
diff --git a/Filters/Selection/Testing/Cxx/TestCellDistanceSelector3D.cxx b/Filters/Selection/Testing/Cxx/TestCellDistanceSelector3D.cxx
index 79fd82b107ad9e05b62ada8ba3617ccb3bfcbe4a..4da79ea4e72c1e0beeb29bff8753e52c1b854888 100644
--- a/Filters/Selection/Testing/Cxx/TestCellDistanceSelector3D.cxx
+++ b/Filters/Selection/Testing/Cxx/TestCellDistanceSelector3D.cxx
@@ -101,7 +101,7 @@ static int CheckExtractedUGrid( vtkExtractSelection* extract,
// If requested, write mesh
if ( writeGrid )
{
- vtksys_ios::ostringstream fileNameSS;
+ std::ostringstream fileNameSS;
fileNameSS << "./CellDistanceExtraction3D-"
<< testIdx
<< ".vtk";
diff --git a/Filters/Selection/Testing/Cxx/TestLinearSelector2D.cxx b/Filters/Selection/Testing/Cxx/TestLinearSelector2D.cxx
index 768d50c98587e0edd2374ac3118e0ba4b71078a8..ecce375a5274bfcbebeba3714b0c5edcda570c3a 100644
--- a/Filters/Selection/Testing/Cxx/TestLinearSelector2D.cxx
+++ b/Filters/Selection/Testing/Cxx/TestLinearSelector2D.cxx
@@ -96,7 +96,7 @@ static int CheckExtractedUGrid( vtkExtractSelection* extract,
// If requested, write mesh
if ( writeGrid )
{
- vtksys_ios::ostringstream fileNameSS;
+ std::ostringstream fileNameSS;
fileNameSS << "./LinearExtraction2D-"
<< testIdx
<< ".vtk";
diff --git a/Filters/Selection/Testing/Cxx/TestLinearSelector3D.cxx b/Filters/Selection/Testing/Cxx/TestLinearSelector3D.cxx
index d7998e9ab408f67b1c4fa66f219e8a1ea3fe9e5a..c00f9665991de70feb52755c60fd77e1d11138e1 100644
--- a/Filters/Selection/Testing/Cxx/TestLinearSelector3D.cxx
+++ b/Filters/Selection/Testing/Cxx/TestLinearSelector3D.cxx
@@ -101,7 +101,7 @@ static int CheckExtractedUGrid( vtkExtractSelection* extract,
// If requested, write mesh
if ( writeGrid )
{
- vtksys_ios::ostringstream fileNameSS;
+ std::ostringstream fileNameSS;
fileNameSS << "./LinearExtraction3D-"
<< testIdx
<< ".vtk";
diff --git a/Filters/Statistics/Testing/Cxx/TestCorrelativeStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestCorrelativeStatistics.cxx
index 5eb0e708d4085aafc82ab126368c5da6c9d99b04..3aa72993e30095df9f8d6f42ce4b8ded4d5f07ea 100644
--- a/Filters/Statistics/Testing/Cxx/TestCorrelativeStatistics.cxx
+++ b/Filters/Statistics/Testing/Cxx/TestCorrelativeStatistics.cxx
@@ -545,7 +545,7 @@ int TestCorrelativeStatistics( int, char *[] )
vtkDoubleArray* datasetNormalZ1 = vtkDoubleArray::New();
datasetNormalZ1->SetNumberOfComponents( 1 );
- vtksys_ios::ostringstream z1Name;
+ std::ostringstream z1Name;
z1Name << rhoXZ1
<< " N(0,1)_1 + "
<< rorXZ1
@@ -554,7 +554,7 @@ int TestCorrelativeStatistics( int, char *[] )
vtkDoubleArray* datasetNormalZ2 = vtkDoubleArray::New();
datasetNormalZ2->SetNumberOfComponents( 1 );
- vtksys_ios::ostringstream z2Name;
+ std::ostringstream z2Name;
z2Name << rhoXZ2
<< " N(0,1)_1 + "
<< rorXZ2
diff --git a/Filters/Statistics/Testing/Cxx/TestKMeansStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestKMeansStatistics.cxx
index 1900dbf1155fb4248e8dfdf58efab7f53fe4af34..b4dc1adcb9ba75395bafb084a01015efd0fb4772 100644
--- a/Filters/Statistics/Testing/Cxx/TestKMeansStatistics.cxx
+++ b/Filters/Statistics/Testing/Cxx/TestKMeansStatistics.cxx
@@ -41,7 +41,7 @@ int TestKMeansStatistics( int, char *[] )
int numComponents = 1;
for ( int c = 0; c < nDim; ++ c )
{
- vtksys_ios::ostringstream colName;
+ std::ostringstream colName;
colName << "coord " << c;
doubleArray = vtkDoubleArray::New();
doubleArray->SetNumberOfComponents( numComponents );
@@ -80,7 +80,7 @@ int TestKMeansStatistics( int, char *[] )
for ( int c = 0; c < 5; ++ c )
{
- vtksys_ios::ostringstream colName;
+ std::ostringstream colName;
colName << "coord " << c;
paramArray = vtkDoubleArray::New();
paramArray->SetNumberOfComponents( numComponents );
diff --git a/Filters/Statistics/Testing/Cxx/TestOrderStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestOrderStatistics.cxx
index 16c81c0066a032a186c5ce658d9af959ea3ca31d..a657d54b92603223a7a5017be4f7de39bc74f34f 100644
--- a/Filters/Statistics/Testing/Cxx/TestOrderStatistics.cxx
+++ b/Filters/Statistics/Testing/Cxx/TestOrderStatistics.cxx
@@ -18,8 +18,8 @@
#include "vtkOrderStatistics.h"
#include "vtkMultiBlockDataSet.h"
-#include <vtksys/stl/vector>
-#include <vtksys/stl/map>
+#include <vector>
+#include <map>
//=============================================================================
int TestOrderStatistics( int, char *[] )
@@ -217,7 +217,7 @@ int TestOrderStatistics( int, char *[] )
testStatus = 1;
}
- vtksys_stl::map<int,int> histoQuantiles;
+ std::map<int,int> histoQuantiles;
for ( vtkIdType r = 0; r < dataQuantArr->GetNumberOfTuples(); ++ r )
{
int qIdx = static_cast<int>( vtkMath::Round( dataQuantArr->GetTuple1( r ) ) );
@@ -225,7 +225,7 @@ int TestOrderStatistics( int, char *[] )
}
int totalHist = 0;
- for ( vtksys_stl::map<int,int>::iterator hit = histoQuantiles.begin();
+ for ( std::map<int,int>::iterator hit = histoQuantiles.begin();
hit != histoQuantiles.end() ; ++ hit )
{
cout << " IQR "
@@ -413,13 +413,13 @@ int TestOrderStatistics( int, char *[] )
// Test Learn operation for quartiles with non-numeric ordinal data
vtkStdString text(
"an ordinal scale defines a total preorder of objects the scale values themselves have a total order names may be used like bad medium good if numbers are used they are only relevant up to strictly monotonically increasing transformations also known as order isomorphisms" );
- vtksys_stl::vector<int>::size_type textLength = text.size();
+ std::vector<int>::size_type textLength = text.size();
vtkStringArray* textArr = vtkStringArray::New();
textArr->SetNumberOfComponents( 1 );
textArr->SetName( "Text" );
- for ( vtksys_stl::vector<int>::size_type i = 0; i < textLength; ++ i )
+ for ( std::vector<int>::size_type i = 0; i < textLength; ++ i )
{
vtkStdString s( "" );
s += text.at(i);
diff --git a/Filters/Statistics/vtkAutoCorrelativeStatistics.cxx b/Filters/Statistics/vtkAutoCorrelativeStatistics.cxx
index fb950eaa25e45ce5b088f547c4f797e4286701d1..0a2a02c4a38d93022ef2b0287e788ab0b749074e 100644
--- a/Filters/Statistics/vtkAutoCorrelativeStatistics.cxx
+++ b/Filters/Statistics/vtkAutoCorrelativeStatistics.cxx
@@ -31,8 +31,8 @@
#include "vtkTable.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/set>
-#include <vtksys/ios/sstream>
+#include <set>
+#include <sstream>
#include <limits>
vtkStandardNewMacro(vtkAutoCorrelativeStatistics);
@@ -283,11 +283,11 @@ void vtkAutoCorrelativeStatistics::Learn( vtkTable* inData,
row->SetNumberOfValues( 7 );
// Loop over requests
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Each request contains only one column of interest (if there are others, they are ignored)
- vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ std::set<vtkStdString>::const_iterator it = rit->begin();
vtkStdString varName = *it;
if ( ! inData->GetColumnByName( varName ) )
{
diff --git a/Filters/Statistics/vtkContingencyStatistics.cxx b/Filters/Statistics/vtkContingencyStatistics.cxx
index dfc332849f9f38cc9df7ead2feb59f521ada2b56..43244301eabde58b83c3098e72d842d005ba7a25 100644
--- a/Filters/Statistics/vtkContingencyStatistics.cxx
+++ b/Filters/Statistics/vtkContingencyStatistics.cxx
@@ -34,13 +34,13 @@ 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>
+#include <sstream>
-typedef vtksys_stl::map<vtkStdString,vtkIdType> Counts;
-typedef vtksys_stl::map<vtkStdString,double> PDF;
+typedef std::map<vtkStdString,vtkIdType> Counts;
+typedef std::map<vtkStdString,double> PDF;
vtkObjectFactoryNewMacro(vtkContingencyStatistics)
@@ -142,11 +142,11 @@ void vtkContingencyStatistics::Learn( vtkTable* inData,
// Loop over requests
vtkIdType nRow = inData->GetNumberOfRows();
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Each request contains only one pair of column of interest (if there are others, they are ignored)
- vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ std::set<vtkStdString>::const_iterator it = rit->begin();
vtkStdString colX = *it;
if ( ! inData->GetColumnByName( colX ) )
{
@@ -177,7 +177,7 @@ void vtkContingencyStatistics::Learn( vtkTable* inData,
vtkAbstractArray* valsY = inData->GetColumnByName( colY );
// Calculate contingency table
- vtksys_stl::map<vtkStdString,Counts> contingencyTable;
+ std::map<vtkStdString,Counts> contingencyTable;
for ( vtkIdType r = 0; r < nRow; ++ r )
{
++ contingencyTable
@@ -186,7 +186,7 @@ void vtkContingencyStatistics::Learn( vtkTable* inData,
}
// Store contingency table
- for ( vtksys_stl::map<vtkStdString,Counts>::iterator mit = contingencyTable.begin();
+ for ( std::map<vtkStdString,Counts>::iterator mit = contingencyTable.begin();
mit != contingencyTable.end(); ++ mit )
{
row4->SetValue( 1, mit->first );
@@ -294,11 +294,11 @@ void vtkContingencyStatistics::Derive( vtkMultiBlockDataSet* inMeta )
}
// Temporary counters, used to check that all pairs of variables have indeed the same number of observations
- vtksys_stl::map<vtkIdType,vtkIdType> cardinalities;
+ std::map<vtkIdType,vtkIdType> cardinalities;
// Calculate marginal counts (marginal PDFs are calculated at storage time to avoid redundant summations)
- vtksys_stl::map<vtkStdString,vtksys_stl::pair<vtkStdString,vtkStdString> > marginalToPair;
- vtksys_stl::map<vtkStdString,Counts> marginalCounts;
+ std::map<vtkStdString,std::pair<vtkStdString,vtkStdString> > marginalToPair;
+ std::map<vtkStdString,Counts> marginalCounts;
vtkStdString x, y, c1, c2;
vtkIdType key, c;
for ( int r = 1; r < nRowCont; ++ r ) // Skip first row which contains data set cardinality
@@ -350,7 +350,7 @@ void vtkContingencyStatistics::Derive( vtkMultiBlockDataSet* inMeta )
// Data set cardinality: unknown yet, pick the cardinality of the first pair and make sure all other pairs
// have the same cardinality.
vtkIdType n = cardinalities[0];
- for ( vtksys_stl::map<vtkIdType,vtkIdType>::iterator iit = cardinalities.begin();
+ for ( std::map<vtkIdType,vtkIdType>::iterator iit = cardinalities.begin();
iit != cardinalities.end(); ++ iit )
{
if ( iit->second != n )
@@ -387,8 +387,8 @@ void vtkContingencyStatistics::Derive( vtkMultiBlockDataSet* inMeta )
// Add marginal PDF tables as new blocks to the meta output starting at block nBlock
// NB: block nBlock is kept for information entropy
double inv_n = 1. / n;
- vtksys_stl::map<vtkStdString,PDF> marginalPDFs;
- for ( vtksys_stl::map<vtkStdString,Counts>::iterator sit = marginalCounts.begin();
+ std::map<vtkStdString,PDF> marginalPDFs;
+ for ( std::map<vtkStdString,Counts>::iterator sit = marginalCounts.begin();
sit != marginalCounts.end(); ++ sit, ++ nBlocks )
{
vtkTable* marginalTab = vtkTable::New();
@@ -435,7 +435,7 @@ void vtkContingencyStatistics::Derive( vtkMultiBlockDataSet* inMeta )
double* derivedVals = new double[nDerivedVals];
// Container for information entropies
- typedef vtksys_stl::map<vtkIdType,double> Entropies;
+ typedef std::map<vtkIdType,double> Entropies;
Entropies *H = new Entropies[nEntropy];
// Calculate joint and conditional PDFs, and information entropies
@@ -536,11 +536,11 @@ void vtkContingencyStatistics::Assess( vtkTable* inData,
// Loop over requests
vtkIdType nRowSumm = summaryTab->GetNumberOfRows();
vtkIdType nRowData = inData->GetNumberOfRows();
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Each request contains only one pair of column of interest (if there are others, they are ignored)
- vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ std::set<vtkStdString>::const_iterator it = rit->begin();
vtkStdString varNameX = *it;
if ( ! inData->GetColumnByName( varNameX ) )
{
@@ -589,7 +589,7 @@ void vtkContingencyStatistics::Assess( vtkTable* inData,
vtkStdString* names = new vtkStdString[nv];
for ( vtkIdType v = 0; v < nv; ++ v )
{
- vtksys_ios::ostringstream assessColName;
+ std::ostringstream assessColName;
assessColName << this->AssessNames->GetValue( v )
<< "("
<< varNameX
@@ -742,11 +742,11 @@ void vtkContingencyStatistics::Test( vtkTable* inData,
// Loop over requests
vtkIdType nRowSumm = summaryTab->GetNumberOfRows();
vtkIdType nRowCont = contingencyTab->GetNumberOfRows();
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Each request contains only one pair of column of interest (if there are others, they are ignored)
- vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ std::set<vtkStdString>::const_iterator it = rit->begin();
vtkStdString varNameX = *it;
if ( ! inData->GetColumnByName( varNameX ) )
{
@@ -792,7 +792,7 @@ void vtkContingencyStatistics::Test( vtkTable* inData,
vtkIdType sumij = 0;
// Loop over parameters table until the requested variables are found
- vtksys_stl::map<vtkStdString,Counts> oij;
+ std::map<vtkStdString,Counts> oij;
vtkStdString x, y;
vtkIdType key, c;
for ( int r = 1; r < nRowCont; ++ r ) // Skip first row which contains data set cardinality
@@ -947,17 +947,17 @@ class BivariateContingenciesAndInformationFunctor : public vtkStatisticsAlgorith
public:
vtkAbstractArray* DataX;
vtkAbstractArray* DataY;
- vtksys_stl::map<vtkStdString,PDF> PdfX_Y;
- vtksys_stl::map<vtkStdString,PDF> PdfYcX;
- vtksys_stl::map<vtkStdString,PDF> PdfXcY;
- vtksys_stl::map<vtkStdString,PDF> PmiX_Y;
+ std::map<vtkStdString,PDF> PdfX_Y;
+ std::map<vtkStdString,PDF> PdfYcX;
+ std::map<vtkStdString,PDF> PdfXcY;
+ std::map<vtkStdString,PDF> PmiX_Y;
BivariateContingenciesAndInformationFunctor( vtkAbstractArray* valsX,
vtkAbstractArray* valsY,
- vtksys_stl::map<vtkStdString,PDF> pdfX_Y,
- vtksys_stl::map<vtkStdString,PDF> pdfYcX,
- vtksys_stl::map<vtkStdString,PDF> pdfXcY,
- vtksys_stl::map<vtkStdString,PDF> pmiX_Y )
+ std::map<vtkStdString,PDF> pdfX_Y,
+ std::map<vtkStdString,PDF> pdfYcX,
+ std::map<vtkStdString,PDF> pdfXcY,
+ std::map<vtkStdString,PDF> pmiX_Y )
{
this->DataX = valsX;
this->DataY = valsY;
@@ -1033,10 +1033,10 @@ void vtkContingencyStatistics::SelectAssessFunctor( vtkTable* outData,
}
// Create parameter maps
- vtksys_stl::map<vtkStdString,PDF> pdfX_Y;
- vtksys_stl::map<vtkStdString,PDF> pdfYcX;
- vtksys_stl::map<vtkStdString,PDF> pdfXcY;
- vtksys_stl::map<vtkStdString,PDF> pmiX_Y;
+ std::map<vtkStdString,PDF> pdfX_Y;
+ std::map<vtkStdString,PDF> pdfYcX;
+ std::map<vtkStdString,PDF> pdfXcY;
+ std::map<vtkStdString,PDF> pmiX_Y;
// Sanity check: joint CDF
double cdf = 0.;
diff --git a/Filters/Statistics/vtkCorrelativeStatistics.cxx b/Filters/Statistics/vtkCorrelativeStatistics.cxx
index e48d32188095c6eae77464654a32eaefecbfa5dd..2b1452770cde62aae71efd9397eeaf1ebc7ac955 100644
--- a/Filters/Statistics/vtkCorrelativeStatistics.cxx
+++ b/Filters/Statistics/vtkCorrelativeStatistics.cxx
@@ -36,9 +36,8 @@
#include "vtkTable.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/set>
-
-#include <vtksys/ios/sstream>
+#include <set>
+#include <sstream>
vtkObjectFactoryNewMacro(vtkCorrelativeStatistics)
@@ -266,11 +265,11 @@ void vtkCorrelativeStatistics::Learn( vtkTable* inData,
// Loop over requests
vtkIdType nRow = inData->GetNumberOfRows();
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Each request contains only one pair of column of interest (if there are others, they are ignored)
- vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ std::set<vtkStdString>::const_iterator it = rit->begin();
vtkStdString colX = *it;
if ( ! inData->GetColumnByName( colX ) )
{
@@ -556,11 +555,11 @@ void vtkCorrelativeStatistics::Test( vtkTable* inData,
// Loop over requests
vtkIdType nRowData = inData->GetNumberOfRows();
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Each request contains only one pair of column of interest (if there are others, they are ignored)
- vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ std::set<vtkStdString>::const_iterator it = rit->begin();
vtkStdString varNameX = *it;
if ( ! inData->GetColumnByName( varNameX ) )
{
diff --git a/Filters/Statistics/vtkDescriptiveStatistics.cxx b/Filters/Statistics/vtkDescriptiveStatistics.cxx
index c7f59e36b05a5bb87d4d519392dd1c1b09a366d2..f12e72d6ff5fa1e54e9ad5b4e6f525baabcf486b 100644
--- a/Filters/Statistics/vtkDescriptiveStatistics.cxx
+++ b/Filters/Statistics/vtkDescriptiveStatistics.cxx
@@ -35,8 +35,8 @@
#include "vtkTable.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/set>
-#include <vtksys/ios/sstream>
+#include <set>
+#include <sstream>
#include <limits>
vtkObjectFactoryNewMacro(vtkDescriptiveStatistics)
@@ -279,11 +279,11 @@ void vtkDescriptiveStatistics::Learn( vtkTable* inData,
// Loop over requests
vtkIdType nRow = inData->GetNumberOfRows();
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Each request contains only one column of interest (if there are others, they are ignored)
- vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ std::set<vtkStdString>::const_iterator it = rit->begin();
vtkStdString varName = *it;
if ( ! inData->GetColumnByName( varName ) )
{
@@ -539,11 +539,11 @@ void vtkDescriptiveStatistics::Test( vtkTable* inData,
vtkStringArray* vars = vtkStringArray::SafeDownCast( primaryTab->GetColumnByName( "Variable" ) );
// Loop over requests
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Each request contains only one column of interest (if there are others, they are ignored)
- vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ std::set<vtkStdString>::const_iterator it = rit->begin();
vtkStdString varName = *it;
if ( ! inData->GetColumnByName( varName ) )
{
diff --git a/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.cxx b/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.cxx
index 5df321c587d9cd63618398f230dd056bb07c5c8a..4c9dd298ec409e85ebf452bb7289fabbc92ce0b4 100644
--- a/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.cxx
+++ b/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.cxx
@@ -64,8 +64,8 @@ void vtkKMeansDistanceFunctorCalculator::operator() (
this->FunctionParser->RemoveScalarVariables();
for ( vtkIdType i = 0; i < nv; ++ i )
{
- vtksys_ios::ostringstream xos;
- vtksys_ios::ostringstream yos;
+ std::ostringstream xos;
+ std::ostringstream yos;
xos << "x" << i;
yos << "y" << i;
this->FunctionParser->SetScalarVariableValue( xos.str().c_str(), clusterCoord->GetValue( i ).ToDouble() );
diff --git a/Filters/Statistics/vtkKMeansStatistics.cxx b/Filters/Statistics/vtkKMeansStatistics.cxx
index 4161a46912362a6a43dca7190ad692260af2d7e0..cc60181a668bd76a7fd10f36cc8037897de5d94f 100644
--- a/Filters/Statistics/vtkKMeansStatistics.cxx
+++ b/Filters/Statistics/vtkKMeansStatistics.cxx
@@ -14,9 +14,9 @@
#include "vtkIntArray.h"
#include "vtkIdTypeArray.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/vector>
-#include <vtksys/ios/sstream>
+#include <map>
+#include <vector>
+#include <sstream>
vtkStandardNewMacro(vtkKMeansStatistics);
vtkCxxSetObjectMacro(vtkKMeansStatistics,DistanceFunctor,vtkKMeansDistanceFunctor);
@@ -67,7 +67,7 @@ int vtkKMeansStatistics::InitializeDataAndClusterCenters(vtkTable* inParameters,
vtkIdTypeArray* startRunID,
vtkIdTypeArray* endRunID)
{
- vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator reqIt;
+ std::set<std::set<vtkStdString> >::const_iterator reqIt;
if( this->Internals->Requests.size() > 1 )
{
static int num = 0;
@@ -120,7 +120,7 @@ int vtkKMeansStatistics::InitializeDataAndClusterCenters(vtkTable* inParameters,
endRunID->InsertNextValue( curRow );
}
vtkTable* condensedTable = vtkTable::New();
- vtksys_stl::set<vtkStdString>::const_iterator colItr;
+ std::set<vtkStdString>::const_iterator colItr;
for ( colItr = reqIt->begin(); colItr != reqIt->end(); ++ colItr )
{
vtkAbstractArray* pArr = inParameters->GetColumnByName( colItr->c_str() );
@@ -182,7 +182,7 @@ void vtkKMeansStatistics::CreateInitialClusterCenters( vtkIdType numToAllocate,
vtkTable* curClusterElements,
vtkTable* newClusterElements )
{
- vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator reqIt;
+ std::set<std::set<vtkStdString> >::const_iterator reqIt;
if( this->Internals->Requests.size() > 1 )
{
static int num = 0;
@@ -561,8 +561,8 @@ void vtkKMeansStatistics::Derive( vtkMultiBlockDataSet* outMeta )
globalRank->SetName( "Global Rank" );
localRank->SetName( "Local Rank" );
- vtksys_stl::multimap<double, vtkIdType> globalErrorMap;
- vtksys_stl::map<vtkIdType, vtksys_stl::multimap<double, vtkIdType> > localErrorMap;
+ std::multimap<double, vtkIdType> globalErrorMap;
+ std::map<vtkIdType, std::multimap<double, vtkIdType> > localErrorMap;
vtkIdType curRow = 0;
while ( curRow < outTable->GetNumberOfRows() )
@@ -576,11 +576,11 @@ void vtkKMeansStatistics::Derive( vtkMultiBlockDataSet* outMeta )
totalErr+= error->GetValue( i );
}
totalError->InsertNextValue( totalErr );
- globalErrorMap.insert(vtksys_stl::multimap<double, vtkIdType>::value_type( totalErr,
+ globalErrorMap.insert(std::multimap<double, vtkIdType>::value_type( totalErr,
clusterRunIDs->GetValue( curRow ) ) );
localErrorMap[numberOfClusters->GetValue( curRow )].insert(
- vtksys_stl::multimap<double, vtkIdType>::value_type( totalErr,
- clusterRunIDs->GetValue( curRow ) ) );
+ std::multimap<double, vtkIdType>::value_type( totalErr,
+ clusterRunIDs->GetValue( curRow ) ) );
curRow += numberOfClusters->GetValue( curRow );
}
@@ -588,14 +588,14 @@ void vtkKMeansStatistics::Derive( vtkMultiBlockDataSet* outMeta )
localRank->SetNumberOfValues( totalClusterRunIDs->GetNumberOfTuples() );
int rankID=1;
- for( vtksys_stl::multimap<double, vtkIdType>::iterator itr = globalErrorMap.begin(); itr != globalErrorMap.end(); itr++ )
+ for( std::multimap<double, vtkIdType>::iterator itr = globalErrorMap.begin(); itr != globalErrorMap.end(); itr++ )
{
globalRank->SetValue( itr->second, rankID++ ) ;
}
- for( vtksys_stl::map<vtkIdType, vtksys_stl::multimap<double, vtkIdType> >::iterator itr = localErrorMap.begin(); itr != localErrorMap.end(); itr++ )
+ for( std::map<vtkIdType, std::multimap<double, vtkIdType> >::iterator itr = localErrorMap.begin(); itr != localErrorMap.end(); itr++ )
{
rankID=1;
- for( vtksys_stl::multimap<double, vtkIdType>::iterator rItr = itr->second.begin(); rItr != itr->second.end(); rItr++ )
+ for( std::multimap<double, vtkIdType>::iterator rItr = itr->second.begin(); rItr != itr->second.end(); rItr++ )
{
localRank->SetValue( rItr->second, rankID++ ) ;
}
@@ -669,7 +669,7 @@ void vtkKMeansStatistics::Assess( vtkTable* inData,
{
for ( vtkIdType v = 0; v < nv; ++ v )
{
- vtksys_ios::ostringstream assessColName;
+ std::ostringstream assessColName;
assessColName << this->AssessNames->GetValue( v )
<< "("
<< i
diff --git a/Filters/Statistics/vtkMultiCorrelativeStatistics.cxx b/Filters/Statistics/vtkMultiCorrelativeStatistics.cxx
index b80fd2592ae368facf41c39bf64d751850f91cb7..e66e915a2ed0d33d4e43d901cfea248ab99bcc77 100644
--- a/Filters/Statistics/vtkMultiCorrelativeStatistics.cxx
+++ b/Filters/Statistics/vtkMultiCorrelativeStatistics.cxx
@@ -16,9 +16,9 @@
#include "vtkTable.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/vector>
-#include <vtksys/ios/sstream>
+#include <map>
+#include <vector>
+#include <sstream>
#define VTK_MULTICORRELATIVE_KEYCOLUMN1 "Column1"
#define VTK_MULTICORRELATIVE_KEYCOLUMN2 "Column2"
@@ -48,7 +48,7 @@ void vtkMultiCorrelativeStatistics::PrintSelf( ostream& os, vtkIndent indent )
}
// ----------------------------------------------------------------------
-static void vtkMultiCorrelativeInvertCholesky( vtksys_stl::vector<double*>& chol, vtksys_stl::vector<double>& inv )
+static void vtkMultiCorrelativeInvertCholesky( std::vector<double*>& chol, std::vector<double>& inv )
{
vtkIdType m = static_cast<vtkIdType>( chol.size() );
inv.resize( m * ( m + 1 ) / 2 );
@@ -77,9 +77,9 @@ static void vtkMultiCorrelativeInvertCholesky( vtksys_stl::vector<double*>& chol
}
// ----------------------------------------------------------------------
-static void vtkMultiCorrelativeTransposeTriangular( vtksys_stl::vector<double>& a, vtkIdType m )
+static void vtkMultiCorrelativeTransposeTriangular( std::vector<double>& a, vtkIdType m )
{
- vtksys_stl::vector<double> b( a.begin(), a.end() );
+ std::vector<double> b( a.begin(), a.end() );
double* bp = &b[0];
vtkIdType i, j;
a.clear();
@@ -298,13 +298,13 @@ void vtkMultiCorrelativeStatistics::Learn( vtkTable* inData,
sparseCov->AddColumn( col3 );
col3->Delete();
- vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator reqIt;
- vtksys_stl::set<vtkStdString>::const_iterator colIt;
- vtksys_stl::set<vtksys_stl::pair<vtkStdString,vtkDataArray*> > allColumns;
- vtksys_stl::map<vtksys_stl::pair<vtkIdType,vtkIdType>,vtkIdType> colPairs;
- vtksys_stl::map<vtksys_stl::pair<vtkIdType,vtkIdType>,vtkIdType>::iterator cpIt;
- vtksys_stl::map<vtkStdString,vtkIdType> colNameToIdx;
- vtksys_stl::vector<vtkDataArray*> colPtrs;
+ std::set<std::set<vtkStdString> >::const_iterator reqIt;
+ std::set<vtkStdString>::const_iterator colIt;
+ std::set<std::pair<vtkStdString,vtkDataArray*> > allColumns;
+ std::map<std::pair<vtkIdType,vtkIdType>,vtkIdType> colPairs;
+ std::map<std::pair<vtkIdType,vtkIdType>,vtkIdType>::iterator cpIt;
+ std::map<vtkStdString,vtkIdType> colNameToIdx;
+ std::vector<vtkDataArray*> colPtrs;
// Populate a vector with pointers to columns of interest (i.e., columns from the input dataset
// which have some statistics requested) and create a map from column names into this vector.
@@ -317,7 +317,7 @@ void vtkMultiCorrelativeStatistics::Learn( vtkTable* inData,
vtkDataArray* arr = vtkDataArray::SafeDownCast( inData->GetColumnByName( colIt->c_str() ) );
if ( arr )
{
- allColumns.insert( vtksys_stl::pair<vtkStdString,vtkDataArray*>( *colIt, arr ) );
+ allColumns.insert( std::pair<vtkStdString,vtkDataArray*>( *colIt, arr ) );
}
}
}
@@ -325,7 +325,7 @@ void vtkMultiCorrelativeStatistics::Learn( vtkTable* inData,
// Now make a map from input column name to output column index (colNameToIdx):
vtkIdType i = 0;
vtkIdType m = static_cast<vtkIdType>( allColumns.size() );
- vtksys_stl::set<vtksys_stl::pair<vtkStdString,vtkDataArray*> >::const_iterator acIt;
+ std::set<std::pair<vtkStdString,vtkDataArray*> >::const_iterator acIt;
vtkStdString empty;
col1->InsertNextValue( "Cardinality" );
col2->InsertNextValue( empty );
@@ -349,20 +349,20 @@ void vtkMultiCorrelativeStatistics::Learn( vtkTable* inData,
// For each column in the request:
for ( colIt = reqIt->begin(); colIt != reqIt->end(); ++ colIt )
{
- vtksys_stl::map<vtkStdString,vtkIdType>::iterator idxIt = colNameToIdx.find( *colIt );
+ std::map<vtkStdString,vtkIdType>::iterator idxIt = colNameToIdx.find( *colIt );
// Ignore invalid column names
if ( idxIt != colNameToIdx.end() )
{
vtkIdType colA = idxIt->second;
vtkStdString colAName = idxIt->first;
- vtksys_stl::set<vtkStdString>::const_iterator colIt2;
+ std::set<vtkStdString>::const_iterator colIt2;
for ( colIt2 = colIt; colIt2 != reqIt->end(); ++ colIt2 )
{
idxIt = colNameToIdx.find( *colIt2 );
// Ignore invalid column names
if ( idxIt != colNameToIdx.end() )
{ // Note that other requests may have inserted this entry.
- vtksys_stl::pair<vtkIdType,vtkIdType> entry( colA, idxIt->second );
+ std::pair<vtkIdType,vtkIdType> entry( colA, idxIt->second );
if ( colPairs.find( entry ) == colPairs.end() )
{
// Point to the offset in col3 (below) for this column-pair sum:
@@ -386,7 +386,7 @@ void vtkMultiCorrelativeStatistics::Learn( vtkTable* inData,
// This uses the on-line algorithms for computing centered
// moments and covariances from Philippe's SAND2008-6212 report.
double* x;
- vtksys_stl::vector<double> v( m, 0. ); // Values (v) for one observation
+ std::vector<double> v( m, 0. ); // Values (v) for one observation
// Storage pattern in primary statistics column:
// Row 0: cardinality of sample
@@ -421,7 +421,7 @@ void vtkMultiCorrelativeStatistics::Learn( vtkTable* inData,
vtkIdType j = cpIt->first.first;
vtkIdType k = cpIt->first.second;
- vtksys_ios::ostringstream nameStr;
+ std::ostringstream nameStr;
nameStr << "Cov{" << j << "," << k << "}";
vtkNew<vtkDoubleArray> col;
col->SetNumberOfTuples( nRow );
@@ -485,7 +485,7 @@ void vtkMultiCorrelativeStatistics::Learn( vtkTable* inData,
}
// ----------------------------------------------------------------------
-static void vtkMultiCorrelativeCholesky( vtksys_stl::vector<double*>& a, vtkIdType m )
+static void vtkMultiCorrelativeCholesky( std::vector<double*>& a, vtkIdType m )
{
// First define some macros to make the Cholevsky decomposition algorithm legible:
#ifdef A
@@ -538,13 +538,13 @@ void vtkMultiCorrelativeStatistics::Derive( vtkMultiBlockDataSet* outMeta )
return;
}
- vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator reqIt;
- vtksys_stl::set<vtkStdString>::const_iterator colIt;
- vtksys_stl::set<vtksys_stl::pair<vtkStdString,vtkDataArray*> > allColumns;
- vtksys_stl::map<vtksys_stl::pair<vtkIdType,vtkIdType>,vtkIdType> colPairs;
- vtksys_stl::map<vtksys_stl::pair<vtkIdType,vtkIdType>,vtkIdType>::iterator cpIt;
- vtksys_stl::map<vtkStdString,vtkIdType> colNameToIdx;
- vtksys_stl::vector<vtkDataArray*> colPtrs;
+ std::set<std::set<vtkStdString> >::const_iterator reqIt;
+ std::set<vtkStdString>::const_iterator colIt;
+ std::set<std::pair<vtkStdString,vtkDataArray*> > allColumns;
+ std::map<std::pair<vtkIdType,vtkIdType>,vtkIdType> colPairs;
+ std::map<std::pair<vtkIdType,vtkIdType>,vtkIdType>::iterator cpIt;
+ std::map<vtkStdString,vtkIdType> colNameToIdx;
+ std::vector<vtkDataArray*> colPtrs;
// Reconstruct information about the computed sums from the raw data.
// The first entry is always the sample size
double n = col3->GetValue( 0 );
@@ -557,7 +557,7 @@ void vtkMultiCorrelativeStatistics::Derive( vtkMultiBlockDataSet* outMeta )
}
for ( ; i < ncol3; ++ i )
{
- vtksys_stl::pair<vtkIdType,vtkIdType> idxs( colNameToIdx[col1->GetValue(i)], colNameToIdx[col2->GetValue(i)] );
+ std::pair<vtkIdType,vtkIdType> idxs( colNameToIdx[col1->GetValue(i)], colNameToIdx[col2->GetValue(i)] );
colPairs[idxs] = i - 1;
}
double* rv = col3->GetPointer( 0 ) + 1;
@@ -579,15 +579,15 @@ void vtkMultiCorrelativeStatistics::Derive( vtkMultiBlockDataSet* outMeta )
colNames->SetName( VTK_MULTICORRELATIVE_COLUMNAMES );
vtkDoubleArray* colAvgs = vtkDoubleArray::New();
colAvgs->SetName( VTK_MULTICORRELATIVE_AVERAGECOL );
- vtksys_stl::vector<vtkDoubleArray*> covCols;
- vtksys_stl::vector<double*> covPtrs;
- vtksys_stl::vector<int> covIdxs;
- vtksys_ios::ostringstream reqNameStr;
+ std::vector<vtkDoubleArray*> covCols;
+ std::vector<double*> covPtrs;
+ std::vector<int> covIdxs;
+ std::ostringstream reqNameStr;
reqNameStr << "Cov(";
// For each column in the request:
for ( colIt = reqIt->begin(); colIt != reqIt->end(); ++ colIt )
{
- vtksys_stl::map<vtkStdString,vtkIdType>::iterator idxIt = colNameToIdx.find( *colIt );
+ std::map<vtkStdString,vtkIdType>::iterator idxIt = colNameToIdx.find( *colIt );
// Ignore invalid column names
if ( idxIt != colNameToIdx.end() )
{
@@ -631,7 +631,7 @@ void vtkMultiCorrelativeStatistics::Derive( vtkMultiBlockDataSet* outMeta )
colAvgs->Delete();
vtkIdType j = 0;
- for ( vtksys_stl::vector<vtkDoubleArray*>::iterator arrIt = covCols.begin(); arrIt != covCols.end(); ++ arrIt, ++ j )
+ for ( std::vector<vtkDoubleArray*>::iterator arrIt = covCols.begin(); arrIt != covCols.end(); ++ arrIt, ++ j )
{
(*arrIt)->SetNumberOfTuples( reqCovSize );
(*arrIt)->FillComponent( 0, 0. );
@@ -644,7 +644,7 @@ void vtkMultiCorrelativeStatistics::Derive( vtkMultiBlockDataSet* outMeta )
(*arrIt)->Delete();
for ( vtkIdType k = 0; k <= j; ++ k, ++ x )
{
- *x = rv[colPairs[vtksys_stl::pair<vtkIdType,vtkIdType>( covIdxs[k], covIdxs[j] )]] * scale;
+ *x = rv[colPairs[std::pair<vtkIdType,vtkIdType>( covIdxs[k], covIdxs[j] )]] * scale;
}
}
else // if ( *arrIt != colAvgs )
@@ -713,7 +713,7 @@ void vtkMultiCorrelativeStatistics::Assess( vtkTable* inData,
vtkStdString* names = new vtkStdString[nv];
for ( int v = 0; v < nv; ++ v )
{
- vtksys_ios::ostringstream assessColName;
+ std::ostringstream assessColName;
assessColName << this->AssessNames->GetValue( v )
<< "(";
for ( int i = 0; i < mcfunc->GetNumberOfColumns(); ++ i )
@@ -812,11 +812,11 @@ bool vtkMultiCorrelativeAssessFunctor::Initialize( vtkTable* inData,
}
// Storage for input data columns
- vtksys_stl::vector<vtkDataArray*> cols;
+ std::vector<vtkDataArray*> cols;
// Storage for Cholesky matrix columns
// NB: Only the lower triangle is significant
- vtksys_stl::vector<double*> chol;
+ std::vector<double*> chol;
vtkIdType m = reqModel->GetNumberOfColumns() - 2;
vtkIdType i;
for ( i = 0; i < m ; ++ i )
@@ -842,7 +842,7 @@ bool vtkMultiCorrelativeAssessFunctor::Initialize( vtkTable* inData,
this->Columns = cols;
this->Center = avgs->GetPointer( 0 );
this->Tuple.resize( m );
- this->EmptyTuple = vtksys_stl::vector<double>( m, 0. );
+ this->EmptyTuple = std::vector<double>( m, 0. );
if ( cholesky )
{
// Store the inverse of chol in this->Factor, F
diff --git a/Filters/Statistics/vtkOrderStatistics.cxx b/Filters/Statistics/vtkOrderStatistics.cxx
index 1d2320f8611d8b06d4a2aa03a3d3ca03af697380..37295bfc92982ccf76021c46eefe189abe447927 100644
--- a/Filters/Statistics/vtkOrderStatistics.cxx
+++ b/Filters/Statistics/vtkOrderStatistics.cxx
@@ -34,9 +34,9 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkVariantArray.h"
#include <cstdlib>
-#include <vtksys/stl/vector>
-#include <vtksys/stl/map>
-#include <vtksys/stl/set>
+#include <vector>
+#include <map>
+#include <set>
vtkStandardNewMacro(vtkOrderStatistics);
@@ -130,11 +130,11 @@ void vtkOrderStatistics::Learn( vtkTable* inData,
// Loop over requests
vtkIdType nRow = inData->GetNumberOfRows();
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Each request contains only one column of interest (if there are others, they are ignored)
- vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ std::set<vtkStdString>::const_iterator it = rit->begin();
vtkStdString col = *it;
if ( ! inData->GetColumnByName( col ) )
{
@@ -197,7 +197,7 @@ void vtkOrderStatistics::Learn( vtkTable* inData,
vtkDataArray* dvals = vtkDataArray::SafeDownCast( vals );
// Calculate histogram
- vtksys_stl::map<double,vtkIdType> histogram;
+ std::map<double,vtkIdType> histogram;
for ( vtkIdType r = 0; r < nRow; ++ r )
{
++ histogram[dvals->GetTuple1( r )];
@@ -237,7 +237,7 @@ void vtkOrderStatistics::Learn( vtkTable* inData,
}
// Store histogram
- for ( vtksys_stl::map<double,vtkIdType>::iterator mit = histogram.begin();
+ for ( std::map<double,vtkIdType>::iterator mit = histogram.begin();
mit != histogram.end(); ++ mit )
{
row->SetValue( 0, mit->first );
@@ -251,14 +251,14 @@ void vtkOrderStatistics::Learn( vtkTable* inData,
vtkStringArray* svals = vtkStringArray::SafeDownCast( vals );
// Calculate histogram
- vtksys_stl::map<vtkStdString,vtkIdType> histogram;
+ std::map<vtkStdString,vtkIdType> histogram;
for ( vtkIdType r = 0; r < nRow; ++ r )
{
++ histogram[svals->GetValue( r )];
}
// Store histogram
- for ( vtksys_stl::map<vtkStdString,vtkIdType>::iterator mit = histogram.begin();
+ for ( std::map<vtkStdString,vtkIdType>::iterator mit = histogram.begin();
mit != histogram.end(); ++ mit )
{
row->SetValue( 0, mit->first );
@@ -272,14 +272,14 @@ void vtkOrderStatistics::Learn( vtkTable* inData,
vtkVariantArray* vvals = vtkVariantArray::SafeDownCast( vals );
// Calculate histogram
- vtksys_stl::map<vtkVariant,vtkIdType> histogram;
+ std::map<vtkVariant,vtkIdType> histogram;
for ( vtkIdType r = 0; r < nRow; ++ r )
{
++ histogram[vvals->GetVariantValue( r )];
}
// Store histogram
- for ( vtksys_stl::map<vtkVariant,vtkIdType>::iterator mit = histogram.begin();
+ for ( std::map<vtkVariant,vtkIdType>::iterator mit = histogram.begin();
mit != histogram.end(); ++ mit )
{
row->SetValue( 0, mit->first );
@@ -447,8 +447,8 @@ void vtkOrderStatistics::Derive( vtkMultiBlockDataSet* inMeta )
}
// Storage for quantile indices
- vtksys_stl::vector<vtksys_stl::pair<vtkIdType,vtkIdType> > quantileIndices;
- vtksys_stl::pair<vtkIdType,vtkIdType> qIdxPair;
+ std::vector<std::pair<vtkIdType,vtkIdType> > quantileIndices;
+ std::pair<vtkIdType,vtkIdType> qIdxPair;
// First quantile index is always 0 with no jump (corresponding to the first and the smallest value)
qIdxPair.first = 0;
@@ -553,7 +553,7 @@ void vtkOrderStatistics::Derive( vtkMultiBlockDataSet* inMeta )
{
// Compute and store quantile values
vtkIdType k = 0;
- for ( vtksys_stl::vector<vtksys_stl::pair<vtkIdType,vtkIdType> >::iterator qit = quantileIndices.begin();
+ for ( std::vector<std::pair<vtkIdType,vtkIdType> >::iterator qit = quantileIndices.begin();
qit != quantileIndices.end(); ++ qit, ++ k )
{
// Retrieve data values from rank into histogram and interpolate
@@ -568,7 +568,7 @@ void vtkOrderStatistics::Derive( vtkMultiBlockDataSet* inMeta )
{
// Compute and store quantile values
vtkIdType k = 0;
- for ( vtksys_stl::vector<vtksys_stl::pair<vtkIdType,vtkIdType> >::iterator qit = quantileIndices.begin();
+ for ( std::vector<std::pair<vtkIdType,vtkIdType> >::iterator qit = quantileIndices.begin();
qit != quantileIndices.end(); ++ qit, ++ k )
{
// Retrieve data value from rank into histogram
@@ -593,7 +593,7 @@ void vtkOrderStatistics::Derive( vtkMultiBlockDataSet* inMeta )
// Compute and store quantile values
vtkIdType k = 0;
- for ( vtksys_stl::vector<vtksys_stl::pair<vtkIdType,vtkIdType> >::iterator qit = quantileIndices.begin();
+ for ( std::vector<std::pair<vtkIdType,vtkIdType> >::iterator qit = quantileIndices.begin();
qit != quantileIndices.end(); ++ qit, ++ k )
{
// Retrieve data value from rank into histogram
@@ -617,7 +617,7 @@ void vtkOrderStatistics::Derive( vtkMultiBlockDataSet* inMeta )
// Compute and store quantile values
vtkIdType k = 0;
- for ( vtksys_stl::vector<vtksys_stl::pair<vtkIdType,vtkIdType> >::iterator qit = quantileIndices.begin();
+ for ( std::vector<std::pair<vtkIdType,vtkIdType> >::iterator qit = quantileIndices.begin();
qit != quantileIndices.end(); ++ qit, ++ k )
{
// Retrieve data value from rank into histogram
@@ -711,11 +711,11 @@ void vtkOrderStatistics::Test( vtkTable* inData,
double inv_nq = 1. / nQuant;
double inv_card = 1. / nRowData;
double sqrt_card = sqrt( static_cast<double>( nRowData ) );
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Each request contains only one column of interest (if there are others, they are ignored)
- vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ std::set<vtkStdString>::const_iterator it = rit->begin();
vtkStdString varName = *it;
if ( ! inData->GetColumnByName( varName ) )
{
@@ -736,7 +736,7 @@ void vtkOrderStatistics::Test( vtkTable* inData,
}
// First iterate over all observations to calculate empirical PDF
- typedef vtksys_stl::map<vtkStdString,double> CDF;
+ typedef std::map<vtkStdString,double> CDF;
CDF cdfEmpirical;
for ( vtkIdType j = 0; j < nRowData; ++ j )
{
@@ -770,8 +770,8 @@ void vtkOrderStatistics::Test( vtkTable* inData,
quantiles[i] = quantileTab->GetValueByName( i, varName ).ToString();
// Update empirical CDF if new value found (with unknown ECDF)
- vtksys_stl::pair<CDF::iterator,bool> result
- = cdfEmpirical.insert( vtksys_stl::pair<vtkStdString,double>( quantiles[i], -1 ) );
+ std::pair<CDF::iterator,bool> result
+ = cdfEmpirical.insert( std::pair<vtkStdString,double>( quantiles[i], -1 ) );
if ( result.second == true )
{
CDF::iterator eit = result.first;
diff --git a/Filters/Statistics/vtkPCAStatistics.cxx b/Filters/Statistics/vtkPCAStatistics.cxx
index 1ee24f0d250def4ec6cde469a4e0cef396292ba8..2713dc77673971363888fc38a6ffb11ff68a2ac5 100644
--- a/Filters/Statistics/vtkPCAStatistics.cxx
+++ b/Filters/Statistics/vtkPCAStatistics.cxx
@@ -531,7 +531,7 @@ static void vtkPCAStatisticsNormalizeSpec( vtkVariantArray* normData,
factor[std::pair<vtkIdType,vtkIdType>( i, j )] = normSpec->GetValue( r, 2 ).ToDouble();
}
// Now normalize cov, recording any missing factors along the way.
- vtksys_ios::ostringstream missing;
+ std::ostringstream missing;
bool gotMissing = false;
std::map<std::pair<vtkIdType,vtkIdType>,double>::iterator fit;
if ( triangle )
@@ -712,7 +712,7 @@ void vtkPCAStatistics::Derive( vtkMultiBlockDataSet* inMeta )
row->SetNumberOfTuples( m + 2 );
for ( i = 0; i < m; ++ i )
{
- vtksys_ios::ostringstream pcaCompName;
+ std::ostringstream pcaCompName;
pcaCompName << VTK_PCA_COMPCOLUMN << " " << i;
row->SetValue( 0, pcaCompName.str().c_str() );
row->SetValue( 1, s( i ) );
@@ -731,7 +731,7 @@ void vtkPCAStatistics::Derive( vtkMultiBlockDataSet* inMeta )
case TRIANGLE_SPECIFIED:
for ( i = 0; i < m; ++ i )
{
- vtksys_ios::ostringstream normCompName;
+ std::ostringstream normCompName;
normCompName << VTK_PCA_NORMCOLUMN << " " << i;
row->SetValue( 0, normCompName.str().c_str() );
row->SetValue( 1, 0. );
@@ -1023,7 +1023,7 @@ void vtkPCAStatistics::Assess( vtkTable* inData,
int comp;
for ( comp = 0; comp < pcafunc->BasisSize; ++ comp )
{
- vtksys_ios::ostringstream reqNameStr;
+ std::ostringstream reqNameStr;
reqNameStr << VTK_PCA_COMPCOLUMN << "{";
for ( int i = 0; i < pcafunc->GetNumberOfColumns(); ++ i )
{
diff --git a/Filters/Statistics/vtkStatisticsAlgorithm.cxx b/Filters/Statistics/vtkStatisticsAlgorithm.cxx
index 14cce8c1f99f23fca86e2a4912a814a3b38e9d10..9e4811c0da59b99a69b61e4d9c8e07059e8333ec 100644
--- a/Filters/Statistics/vtkStatisticsAlgorithm.cxx
+++ b/Filters/Statistics/vtkStatisticsAlgorithm.cxx
@@ -34,7 +34,7 @@
#include "vtkTable.h"
#include "vtkVariantArray.h"
-#include <vtksys/ios/sstream>
+#include <sstream>
vtkCxxSetObjectMacro(vtkStatisticsAlgorithm,AssessNames,vtkStringArray);
@@ -300,7 +300,7 @@ void vtkStatisticsAlgorithm::Assess( vtkTable* inData,
}
// Loop over requests
- for ( vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
+ for ( std::set<std::set<vtkStdString> >::const_iterator rit = this->Internals->Requests.begin();
rit != this->Internals->Requests.end(); ++ rit )
{
// Storage for variable names of the request (smart pointer because of several exit points)
@@ -310,7 +310,7 @@ void vtkStatisticsAlgorithm::Assess( vtkTable* inData,
// Each request must contain numVariables columns of interest (additional columns are ignored)
bool invalidRequest = false;
int v = 0;
- for ( vtksys_stl::set<vtkStdString>::const_iterator it = rit->begin();
+ for ( std::set<vtkStdString>::const_iterator it = rit->begin();
v < numVariables && it != rit->end(); ++ v, ++ it )
{
// Try to retrieve column with corresponding name in input data
@@ -354,7 +354,7 @@ void vtkStatisticsAlgorithm::Assess( vtkTable* inData,
for ( vtkIdType a = 0; a < nAssessments; ++ a )
{
// Prepare string for numVariables-tuple of variable names
- vtksys_ios::ostringstream assessColName;
+ std::ostringstream assessColName;
assessColName << this->AssessNames->GetValue( a )
<< "(";
for ( int i = 0 ; i < numVariables ; ++ i )
diff --git a/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h b/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h
index 1c7e558f5866a0d98b83003264778529870fb426..a48abd426d499625352c275eb2462c7b0f8ee56b 100644
--- a/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h
+++ b/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h
@@ -33,7 +33,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkStdString.h"
-#include <vtksys/stl/set> // used to iterate over internal organs
+#include <set> // used to iterate over internal organs
class vtkStatisticsAlgorithmPrivate
{
@@ -90,7 +90,7 @@ public:
{
if ( col && strlen( col ) )
{
- vtksys_stl::set<vtkStdString> tmp;
+ std::set<vtkStdString> tmp;
tmp.insert( col );
if ( this->Requests.insert( tmp ).second )
{
@@ -106,7 +106,7 @@ public:
{
if ( cola && colb && strlen( cola ) && strlen( colb ) )
{
- vtksys_stl::set<vtkStdString> tmp;
+ std::set<vtkStdString> tmp;
tmp.insert( cola );
tmp.insert( colb );
if ( this->Requests.insert( tmp ).second )
@@ -132,7 +132,7 @@ public:
{
return 0;
}
- vtksys_stl::set<vtksys_stl::set<vtkStdString> >::iterator it = this->Requests.begin();
+ std::set<std::set<vtkStdString> >::iterator it = this->Requests.begin();
for ( vtkIdType i = 0; i < r; ++ i )
{
++ it;
@@ -149,7 +149,7 @@ public:
{
return false;
}
- vtksys_stl::set<vtksys_stl::set<vtkStdString> >::const_iterator it = this->Requests.begin();
+ std::set<std::set<vtkStdString> >::const_iterator it = this->Requests.begin();
for ( vtkIdType i = 0; i < r; ++ i )
{
++ it;
@@ -158,7 +158,7 @@ public:
{
return false;
}
- vtksys_stl::set<vtkStdString>::const_iterator cit = it->begin();
+ std::set<vtkStdString>::const_iterator cit = it->begin();
for ( vtkIdType j = 0; j < c; ++ j )
{
++ cit;
@@ -167,8 +167,8 @@ public:
return true;
}
- vtksys_stl::set<vtksys_stl::set<vtkStdString> > Requests;
- vtksys_stl::set<vtkStdString> Buffer;
+ std::set<std::set<vtkStdString> > Requests;
+ std::set<vtkStdString> Buffer;
};
#endif // vtkStatisticsAlgorithmPrivate_h
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestCorrelativeStatistics.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestCorrelativeStatistics.cxx
index 09bbe8dc5eda7a87cbae74097e46bc83b4d05790..8c65d400c037d13c3fcd4c719d1b196d781fb1ca 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestCorrelativeStatistics.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestCorrelativeStatistics.cxx
@@ -545,7 +545,7 @@ int TestCorrelativeStatistics( int, char *[] )
vtkDoubleArray* datasetNormalZ1 = vtkDoubleArray::New();
datasetNormalZ1->SetNumberOfComponents( 1 );
- vtksys_ios::ostringstream z1Name;
+ std::ostringstream z1Name;
z1Name << rhoXZ1
<< " N(0,1)_1 + "
<< rorXZ1
@@ -554,7 +554,7 @@ int TestCorrelativeStatistics( int, char *[] )
vtkDoubleArray* datasetNormalZ2 = vtkDoubleArray::New();
datasetNormalZ2->SetNumberOfComponents( 1 );
- vtksys_ios::ostringstream z2Name;
+ std::ostringstream z2Name;
z2Name << rhoXZ2
<< " N(0,1)_1 + "
<< rorXZ2
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx
index 971f1ea82e79628f0fa948923da5f4cd897aa3cc..f4da9a38ae986cef619bdd0f06b0faa3d0d1e967 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx
@@ -46,7 +46,7 @@ namespace
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx
index e62cc0fa6e994a06a073202ef57454626aedf365..cc1f7d7925490c6c913808e30c00427fb37ccc76 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx
@@ -46,7 +46,7 @@ namespace
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx
index 6dd2567d66613bb899e4b4045d2183c9492c4774..9155ffac7c62b1351c4a91ccf6dd971683492455 100644
--- a/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx
+++ b/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx
@@ -38,7 +38,7 @@ namespace
{ \
if(!(expression)) \
{ \
- vtksys_ios::ostringstream buffer; \
+ std::ostringstream buffer; \
buffer << "Expression failed at line " << __LINE__ << ": " << #expression; \
throw std::runtime_error(buffer.str()); \
} \
diff --git a/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx b/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx
index d82d53a2ec1e09842dba335b8345ca168ec3344f..192f76294c724fc3a05831fa6eb7c777e010d066 100644
--- a/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx
+++ b/Filters/StatisticsGnuR/vtkContingencyStatisticsGnuR.cxx
@@ -74,7 +74,7 @@ void vtkContingencyStatisticsGnuR::CalculatePValues( vtkTable* outTab)
ri->AssignVTKDataArrayToRVariable( chi2yCol, "chi2y" );
// Now prepare R script and calculate the p-values (in a single R script evaluation for efficiency)
- vtksys_ios::ostringstream rs;
+ std::ostringstream rs;
rs << "p<-c();"
<< "py<-c();"
<< "for(i in 1:"
diff --git a/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.cxx b/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.cxx
index 170374376766abfc89b88f83902268d3727c57d9..18f0bf26a6291564433bd3015b68357cc0b8c038 100644
--- a/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.cxx
+++ b/Filters/StatisticsGnuR/vtkPCAStatisticsGnuR.cxx
@@ -52,7 +52,7 @@ vtkDoubleArray* vtkPCAStatisticsGnuR::CalculatePValues(vtkIdTypeArray* dimCol,
// Calculate the p-values (p+1 degrees of freedom)
// Now prepare R script and calculate the p-values (in a single R script evaluation for efficiency)
- vtksys_ios::ostringstream rs;
+ std::ostringstream rs;
rs << "p<-c();"
<< "for(i in 1:"
<< dimCol->GetNumberOfTuples()
diff --git a/GUISupport/Qt/vtkQtTableModelAdapter.cxx b/GUISupport/Qt/vtkQtTableModelAdapter.cxx
index 6c63eaf1bda1440e06b1e771d383ef3936ed3772..44ebd2d3e7f0ed1366130841c5eb0b7d184b8ac1 100644
--- a/GUISupport/Qt/vtkQtTableModelAdapter.cxx
+++ b/GUISupport/Qt/vtkQtTableModelAdapter.cxx
@@ -786,7 +786,7 @@ QMimeData *vtkQtTableModelAdapter::mimeData(const QModelIndexList &indexes) cons
return 0;
}
- vtksys_ios::ostringstream buffer;
+ std::ostringstream buffer;
buffer << pedigreeIdSelection;
QMimeData *mime_data = new QMimeData();
diff --git a/GUISupport/Qt/vtkQtTreeModelAdapter.cxx b/GUISupport/Qt/vtkQtTreeModelAdapter.cxx
index 2c4c5f9c1cea93343a3f5e982f37befd47683a8f..612056e1cd9ccfd124ab88ccf307e687c68ab358 100644
--- a/GUISupport/Qt/vtkQtTreeModelAdapter.cxx
+++ b/GUISupport/Qt/vtkQtTreeModelAdapter.cxx
@@ -570,7 +570,7 @@ QMimeData *vtkQtTreeModelAdapter::mimeData(const QModelIndexList &indexes) const
return 0;
}
- vtksys_ios::ostringstream buffer;
+ std::ostringstream buffer;
buffer << pedigreeIdSelection;
QMimeData *mime_data = new QMimeData();
diff --git a/GUISupport/QtSQL/vtkQtSQLQuery.cxx b/GUISupport/QtSQL/vtkQtSQLQuery.cxx
index a420741ec808bff275168a526beb56a9f28d3150..a5ae68abd0940309a70c4475192ca48b078fb47d 100644
--- a/GUISupport/QtSQL/vtkQtSQLQuery.cxx
+++ b/GUISupport/QtSQL/vtkQtSQLQuery.cxx
@@ -36,14 +36,14 @@
#include <QDateTime>
#include <QDate>
#include <QTime>
-#include <vtksys/stl/string>
-#include <vtksys/stl/vector>
+#include <string>
+#include <vector>
class vtkQtSQLQueryInternals
{
public:
QSqlQuery QtQuery;
- vtksys_stl::vector<vtksys_stl::string> FieldNames;
+ std::vector<std::string> FieldNames;
};
diff --git a/Geovis/Core/vtkGeoAdaptiveArcs.cxx b/Geovis/Core/vtkGeoAdaptiveArcs.cxx
index 7857b41e548b0a9bae34227d5301aa2f92e40c7a..fc96f5e2541eb09136498735f2dbad35bc6b8b19 100644
--- a/Geovis/Core/vtkGeoAdaptiveArcs.cxx
+++ b/Geovis/Core/vtkGeoAdaptiveArcs.cxx
@@ -36,8 +36,7 @@
#include "vtkRendererCollection.h"
#include "vtkTimerLog.h"
-#include <vtksys/stl/map>
-using vtksys_stl::map;
+#include <map>
vtkStandardNewMacro(vtkGeoAdaptiveArcs);
diff --git a/Geovis/Core/vtkGeoAlignedImageRepresentation.cxx b/Geovis/Core/vtkGeoAlignedImageRepresentation.cxx
index 7488a61bf716b8f50640e57a02077e8ea988e558..37d87df36c3133cf2420921e0f49d53d0a6187cd 100644
--- a/Geovis/Core/vtkGeoAlignedImageRepresentation.cxx
+++ b/Geovis/Core/vtkGeoAlignedImageRepresentation.cxx
@@ -33,16 +33,16 @@
#include "vtkXMLImageDataReader.h"
#include "vtkXMLImageDataWriter.h"
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/stack>
-#include <vtksys/stl/utility>
+#include <sstream>
+#include <stack>
+#include <utility>
-static vtksys_stl::pair<vtkGeoImageNode*, double>
+static std::pair<vtkGeoImageNode*, double>
vtkGeoAlignedImageRepresentationFind(vtkGeoSource* source, vtkGeoImageNode* p, double* bounds, vtkGeoTreeNodeCache* nodeList)
{
if (!p->HasData())
{
- return vtksys_stl::make_pair(static_cast<vtkGeoImageNode*>(0), 0.0);
+ return std::make_pair(static_cast<vtkGeoImageNode*>(0), 0.0);
}
double lb[3];
double ub[3];
@@ -58,7 +58,7 @@ vtkGeoAlignedImageRepresentationFind(vtkGeoSource* source, vtkGeoImageNode* p, d
ub[1] >= bounds[3])
{
nodeList->SendToFront(p);
- vtksys_stl::pair<vtkGeoImageNode*, double> minDist(static_cast<vtkGeoImageNode *>(NULL), VTK_DOUBLE_MAX);
+ std::pair<vtkGeoImageNode*, double> minDist(static_cast<vtkGeoImageNode *>(NULL), VTK_DOUBLE_MAX);
vtkGeoImageNode* child = p->GetChild(0);
vtkCollection* coll = NULL;
@@ -109,7 +109,7 @@ vtkGeoAlignedImageRepresentationFind(vtkGeoSource* source, vtkGeoImageNode* p, d
{
for (int i = 0; i < 4; ++i)
{
- vtksys_stl::pair<vtkGeoImageNode*, double> subsearch =
+ std::pair<vtkGeoImageNode*, double> subsearch =
vtkGeoAlignedImageRepresentationFind(source, p->GetChild(i), bounds, nodeList);
if (subsearch.first && subsearch.second < minDist.second)
{
@@ -121,11 +121,11 @@ vtkGeoAlignedImageRepresentationFind(vtkGeoSource* source, vtkGeoImageNode* p, d
{
return minDist;
}
- return vtksys_stl::make_pair(p, dist2);
+ return std::make_pair(p, dist2);
}
else
{
- return vtksys_stl::make_pair(static_cast<vtkGeoImageNode*>(0), 0.0);
+ return std::make_pair(static_cast<vtkGeoImageNode*>(0), 0.0);
}
}
@@ -185,7 +185,7 @@ void vtkGeoAlignedImageRepresentation::SaveDatabase(const char* path)
{
this->Initialize();
}
- vtksys_stl::stack< vtkSmartPointer<vtkGeoImageNode> > s;
+ std::stack< vtkSmartPointer<vtkGeoImageNode> > s;
s.push(this->Root);
while (!s.empty())
{
@@ -222,7 +222,7 @@ void vtkGeoAlignedImageRepresentation::SaveDatabase(const char* path)
//----------------------------------------------------------------------------
vtkGeoImageNode* vtkGeoAlignedImageRepresentation::GetBestImageForBounds(double bounds[4])
{
- vtksys_stl::pair<vtkGeoImageNode*, double> res =
+ std::pair<vtkGeoImageNode*, double> res =
vtkGeoAlignedImageRepresentationFind(this->GeoSource, this->Root, bounds, this->Cache);
return res.first;
}
diff --git a/Geovis/Core/vtkGeoArcs.cxx b/Geovis/Core/vtkGeoArcs.cxx
index 4af7b450b04fb141e19718b63a97351407ba122d..bfb5534120c92a1500057221d8e3655f59f851d8 100644
--- a/Geovis/Core/vtkGeoArcs.cxx
+++ b/Geovis/Core/vtkGeoArcs.cxx
@@ -30,9 +30,6 @@
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
-#include <vtksys/stl/map>
-using vtksys_stl::map;
-
vtkStandardNewMacro(vtkGeoArcs);
vtkGeoArcs::vtkGeoArcs()
diff --git a/Geovis/Core/vtkGeoFileImageSource.cxx b/Geovis/Core/vtkGeoFileImageSource.cxx
index b2fffb7eb86c29a9325c18e2bdbc0c52741ae1fe..21de343e19b435bed2f302dbe138c484b74c47a5 100644
--- a/Geovis/Core/vtkGeoFileImageSource.cxx
+++ b/Geovis/Core/vtkGeoFileImageSource.cxx
@@ -126,13 +126,13 @@ bool vtkGeoFileImageSource::ReadImage(int level, int id, vtkGeoImageNode* node)
node->SetId(id);
node->SetLevel(level);
vtkSmartPointer<vtkXMLImageDataReader> reader = vtkSmartPointer<vtkXMLImageDataReader>::New();
- vtksys_ios::stringstream ss;
+ std::stringstream ss;
ss.str("");
ss << this->Path << "/tile_" << level << "_" << id << ".vti";
// Check if the file exists
- vtksys_ios::ifstream in;
- in.open(ss.str().c_str(), vtksys_ios::ifstream::in);
+ std::ifstream in;
+ in.open(ss.str().c_str(), std::ifstream::in);
if (in.fail())
{
// Make a dummy image
diff --git a/Geovis/Core/vtkGeoFileTerrainSource.cxx b/Geovis/Core/vtkGeoFileTerrainSource.cxx
index f8800b646b4f62885fca4f6240dc5105a64da963..1834b23c06801c6b4d8e9d5b7056b6bc49231039 100644
--- a/Geovis/Core/vtkGeoFileTerrainSource.cxx
+++ b/Geovis/Core/vtkGeoFileTerrainSource.cxx
@@ -87,13 +87,13 @@ bool vtkGeoFileTerrainSource::ReadModel(int level, int id, vtkGeoTerrainNode* no
node->SetId(id);
node->SetLevel(level);
vtkSmartPointer<vtkXMLPolyDataReader> reader = vtkSmartPointer<vtkXMLPolyDataReader>::New();
- vtksys_ios::stringstream ss;
+ std::stringstream ss;
ss.str("");
ss << this->Path << "/tile_" << level << "_" << id << ".vtp";
// Check if the file exists
- vtksys_ios::ifstream in;
- in.open(ss.str().c_str(), vtksys_ios::ifstream::in);
+ std::ifstream in;
+ in.open(ss.str().c_str(), std::ifstream::in);
if (in.fail())
{
// Make a dummy polydata
diff --git a/Geovis/Core/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx
index a64e7994859dfd1ef524cf222b30d757acf2a775..817e17446232d7eae3ae625d3a356d3dd13245a4 100644
--- a/Geovis/Core/vtkGeoProjection.cxx
+++ b/Geovis/Core/vtkGeoProjection.cxx
@@ -199,7 +199,7 @@ int vtkGeoProjection::UpdateProjection()
projSpec += this->Name;
std::string ellpsSpec( "+ellps=clrk66" );
std::string meridSpec;
- vtksys_ios::ostringstream os;
+ std::ostringstream os;
os << "+lon_0=" << this->CentralMeridian;
meridSpec = os.str();
pjArgs[0] = projSpec.c_str();
@@ -210,7 +210,7 @@ int vtkGeoProjection::UpdateProjection()
std::vector<std::string> stringHolder; // Keep string ref in memory
for(int i=0; i < this->GetNumberOfOptionalParameters(); i++)
{
- vtksys_ios::ostringstream param;
+ std::ostringstream param;
param << "+" << this->GetOptionalParameterKey(i);
param << "=" << this->GetOptionalParameterValue(i);
stringHolder.push_back(param.str());
diff --git a/Geovis/Core/vtkGeoSampleArcs.cxx b/Geovis/Core/vtkGeoSampleArcs.cxx
index 0b465b114ebfa47acdeaee28d33207970ce83973..9dc33bca8895bfcfc20a72103f84584c17b75ee3 100644
--- a/Geovis/Core/vtkGeoSampleArcs.cxx
+++ b/Geovis/Core/vtkGeoSampleArcs.cxx
@@ -36,9 +36,6 @@
#include "vtkRendererCollection.h"
#include "vtkTimerLog.h"
-#include <vtksys/stl/map>
-using vtksys_stl::map;
-
vtkStandardNewMacro(vtkGeoSampleArcs);
vtkGeoSampleArcs::vtkGeoSampleArcs()
diff --git a/Geovis/Core/vtkGeoSource.cxx b/Geovis/Core/vtkGeoSource.cxx
index 3e23655acb158a62457ec15f838ab6cff9a807ba..0ffaaa86354af91c14996af6966276637e1ddd41 100644
--- a/Geovis/Core/vtkGeoSource.cxx
+++ b/Geovis/Core/vtkGeoSource.cxx
@@ -30,9 +30,9 @@
#include "vtkSmartPointer.h"
#include "vtkTimerLog.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
+#include <map>
+#include <utility>
+#include <vector>
static VTK_THREAD_RETURN_TYPE vtkGeoSourceThreadStart(void* arg)
{
@@ -44,8 +44,8 @@ static VTK_THREAD_RETURN_TYPE vtkGeoSourceThreadStart(void* arg)
class vtkGeoSource::implementation {
public:
- vtksys_stl::map<vtksys_stl::pair<unsigned long, int>, vtkSmartPointer<vtkCollection> > OutputMap;
- vtksys_stl::vector<int> ThreadIds;
+ std::map<std::pair<unsigned long, int>, vtkSmartPointer<vtkCollection> > OutputMap;
+ std::vector<int> ThreadIds;
};
vtkGeoSource::vtkGeoSource()
@@ -121,7 +121,7 @@ vtkCollection* vtkGeoSource::GetRequestedNodes(vtkGeoTreeNode* node)
{
vtkCollection* c = 0;
this->OutputSetLock->Lock();
- vtksys_stl::pair<unsigned long, int> p(node->GetId(), node->GetLevel());
+ std::pair<unsigned long, int> p(node->GetId(), node->GetLevel());
if (this->Implementation->OutputMap.count(p) > 0)
{
c = this->Implementation->OutputMap[p];
@@ -212,7 +212,7 @@ void vtkGeoSource::WorkerThread()
// Move from processing set to output
this->OutputSetLock->Lock();
- vtksys_stl::pair<unsigned long, int> p(node->GetId(), node->GetLevel());
+ std::pair<unsigned long, int> p(node->GetId(), node->GetLevel());
this->Implementation->OutputMap[p] =
vtkSmartPointer<vtkCollection>::New();
if (success)
diff --git a/Geovis/Core/vtkGeoTerrain.cxx b/Geovis/Core/vtkGeoTerrain.cxx
index 372827838538a7b7311c8d4f8b47aa38982f5782..806d624c53ec7363bd0f6dc221799b5874466542 100644
--- a/Geovis/Core/vtkGeoTerrain.cxx
+++ b/Geovis/Core/vtkGeoTerrain.cxx
@@ -54,8 +54,8 @@
#include "vtkTransformFilter.h"
#include "vtkXMLPolyDataWriter.h"
-#include <vtksys/stl/stack>
-#include <vtksys/stl/utility>
+#include <stack>
+#include <utility>
vtkStandardNewMacro(vtkGeoTerrain);
vtkCxxSetObjectMacro(vtkGeoTerrain, GeoSource, vtkGeoSource);
@@ -242,7 +242,7 @@ void vtkGeoTerrain::AddActors(
}
// Use stack rather than recursion
- vtksys_stl::stack<vtkGeoTerrainNode*> s;
+ std::stack<vtkGeoTerrainNode*> s;
s.push(this->Root);
vtkGeoTerrainNode* child = NULL;
@@ -493,7 +493,7 @@ void vtkGeoTerrain::SaveDatabase(const char* path, int depth)
{
this->Initialize();
}
- vtksys_stl::stack< vtkSmartPointer<vtkGeoTerrainNode> > s;
+ std::stack< vtkSmartPointer<vtkGeoTerrainNode> > s;
s.push(this->Root);
while (!s.empty())
{
diff --git a/IO/Core/vtkDelimitedTextWriter.cxx b/IO/Core/vtkDelimitedTextWriter.cxx
index 367f568aa34ad3408843d13002b58b17fae060a2..9f70302ba2affd6468ba136ea351fa67b509482d 100644
--- a/IO/Core/vtkDelimitedTextWriter.cxx
+++ b/IO/Core/vtkDelimitedTextWriter.cxx
@@ -71,7 +71,7 @@ bool vtkDelimitedTextWriter::OpenStream()
{
if (this->WriteToOutputString)
{
- this->Stream = new vtksys_ios::ostringstream;
+ this->Stream = new std::ostringstream;
}
else
{
@@ -213,7 +213,7 @@ void vtkDelimitedTextWriter::WriteTable(vtkTable* table)
}
first = false;
- vtksys_ios::ostringstream array_name;
+ std::ostringstream array_name;
array_name << array->GetName();
if (array->GetNumberOfComponents() > 1)
{
@@ -251,8 +251,8 @@ void vtkDelimitedTextWriter::WriteTable(vtkTable* table)
if (this->WriteToOutputString)
{
- vtksys_ios::ostringstream *ostr =
- static_cast<vtksys_ios::ostringstream*>(this->Stream);
+ std::ostringstream *ostr =
+ static_cast<std::ostringstream*>(this->Stream);
delete [] this->OutputString;
size_t strLen = ostr->str().size();
diff --git a/IO/Core/vtkWriter.cxx b/IO/Core/vtkWriter.cxx
index e58dfd4eef6f737ab25e52761b24452ef153d825..ddd3ee0c7a540c9d4e57cfaf0ae51bd830bfc904 100644
--- a/IO/Core/vtkWriter.cxx
+++ b/IO/Core/vtkWriter.cxx
@@ -157,7 +157,7 @@ void vtkWriter::EncodeString(char* resname, const char* name, bool doublePercent
return;
}
int cc = 0;
- vtksys_ios::ostringstream str;
+ std::ostringstream str;
char buffer[10];
diff --git a/IO/EnSight/vtkEnSightGoldReader.cxx b/IO/EnSight/vtkEnSightGoldReader.cxx
index 9255211540f57618513e1e621c2ed5f178d38c11..10f21b5608b7cdd1def8198546b8e8ce179def94 100644
--- a/IO/EnSight/vtkEnSightGoldReader.cxx
+++ b/IO/EnSight/vtkEnSightGoldReader.cxx
@@ -1739,9 +1739,9 @@ int vtkEnSightGoldReader::CreateUnstructuredGridOutput(int partId,
{
int *numNodesPerElement;
int numNodes;
- vtksys_ios::stringstream* lineStream = new vtksys_ios::stringstream(vtksys_ios::stringstream::out);
- vtksys_ios::stringstream* formatStream = new vtksys_ios::stringstream(vtksys_ios::stringstream::out);
- vtksys_ios::stringstream* tempStream = new vtksys_ios::stringstream(vtksys_ios::stringstream::out);
+ std::stringstream* lineStream = new std::stringstream(std::stringstream::out);
+ std::stringstream* formatStream = new std::stringstream(std::stringstream::out);
+ std::stringstream* tempStream = new std::stringstream(std::stringstream::out);
this->ReadNextDataLine(line);
numElements = atoi(line);
@@ -1771,22 +1771,22 @@ int vtkEnSightGoldReader::CreateUnstructuredGridOutput(int partId,
formatStream->str("");
tempStream->str("");
lineStream->str(line);
- lineStream->seekp(0, vtksys_ios::stringstream::end);
+ lineStream->seekp(0, std::stringstream::end);
while (! lineRead)
{
lineRead = this->ReadNextDataLine(line);
lineStream->write(line, strlen(line));
- lineStream->seekp(0, vtksys_ios::stringstream::end);
+ lineStream->seekp(0, std::stringstream::end);
}
for (j = 0; j < numNodes; j++)
{
formatStream->write(" %d", 3);
- formatStream->seekp(0, vtksys_ios::stringstream::end);
+ formatStream->seekp(0, std::stringstream::end);
sscanf(lineStream->str().c_str(), formatStream->str().c_str(), &intIds[numNodes-j-1]);
tempStream->write(" %*d", 4);
- tempStream->seekp(0, vtksys_ios::stringstream::end);
+ tempStream->seekp(0, std::stringstream::end);
formatStream->str(tempStream->str());
- formatStream->seekp(0, vtksys_ios::stringstream::end);
+ formatStream->seekp(0, std::stringstream::end);
intIds[numNodes-j-1]--;
nodeIds[numNodes-j-1] = intIds[numNodes-j-1];
}
@@ -2049,9 +2049,9 @@ int vtkEnSightGoldReader::CreateUnstructuredGridOutput(int partId,
int numNodes = 0;
int faceCount = 0;
int elementNodeCount = 0;
- vtksys_ios::stringstream* lineStream = new vtksys_ios::stringstream(vtksys_ios::stringstream::out);
- vtksys_ios::stringstream* formatStream = new vtksys_ios::stringstream(vtksys_ios::stringstream::out);
- vtksys_ios::stringstream* tempStream = new vtksys_ios::stringstream(vtksys_ios::stringstream::out);
+ std::stringstream* lineStream = new std::stringstream(std::stringstream::out);
+ std::stringstream* formatStream = new std::stringstream(std::stringstream::out);
+ std::stringstream* tempStream = new std::stringstream(std::stringstream::out);
this->ReadNextDataLine(line);
numElements = atoi(line);
@@ -2103,22 +2103,22 @@ int vtkEnSightGoldReader::CreateUnstructuredGridOutput(int partId,
formatStream->str("");
tempStream->str("");
lineStream->str(line);
- lineStream->seekp(0, vtksys_ios::stringstream::end);
+ lineStream->seekp(0, std::stringstream::end);
while (! lineRead)
{
lineRead = this->ReadNextDataLine(line);
lineStream->write(line, strlen(line));
- lineStream->seekp(0, vtksys_ios::stringstream::end);
+ lineStream->seekp(0, std::stringstream::end);
}
for (k = 0; k < numNodesPerFace[faceCount + j]; k++)
{
formatStream->write(" %d", 3);
- formatStream->seekp(0, vtksys_ios::stringstream::end);
+ formatStream->seekp(0, std::stringstream::end);
sscanf(lineStream->str().c_str(), formatStream->str().c_str(), &intIds[elementNodeCount]);
tempStream->write(" %*d", 4);
- tempStream->seekp(0, vtksys_ios::stringstream::end);
+ tempStream->seekp(0, std::stringstream::end);
formatStream->str(tempStream->str());
- formatStream->seekp(0, vtksys_ios::stringstream::end);
+ formatStream->seekp(0, std::stringstream::end);
elementNodeCount += 1;
}
lineRead = this->ReadNextDataLine(line);
diff --git a/IO/Exodus/vtkExodusIIReaderParser.cxx b/IO/Exodus/vtkExodusIIReaderParser.cxx
index 8f195dbd2c2af4267e372bb420403ef5ef5fdc2e..eef148456c9e33eeb5ee675875c016daa3123769 100644
--- a/IO/Exodus/vtkExodusIIReaderParser.cxx
+++ b/IO/Exodus/vtkExodusIIReaderParser.cxx
@@ -287,7 +287,7 @@ void vtkExodusIIReaderParser::FinishedParsing()
desc = this->PartVertexID_To_Descriptions[partVertex];
}
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
stream << "Block: " << iter->first
<< " (" << desc.c_str()<< ") "
<< this->BlockID_To_Part[iter->first].c_str();
diff --git a/IO/Exodus/vtkExodusIIReaderVariableCheck.cxx b/IO/Exodus/vtkExodusIIReaderVariableCheck.cxx
index 48079263608829d9310c8de30a66e99de811b1c7..f0a782061b19e662f5410fd184a16954c1f5f196 100644
--- a/IO/Exodus/vtkExodusIIReaderVariableCheck.cxx
+++ b/IO/Exodus/vtkExodusIIReaderVariableCheck.cxx
@@ -14,7 +14,7 @@
#include <ctype.h>
-bool vtkExodusIIReaderVariableCheck::Start( vtksys_stl::string name, const int* truth, int numTruth )
+bool vtkExodusIIReaderVariableCheck::Start( std::string name, const int* truth, int numTruth )
{
this->SeqTruth.clear();
this->SeqTruth.insert( this->SeqTruth.begin(), truth, truth + numTruth );
@@ -29,7 +29,7 @@ bool vtkExodusIIReaderVariableCheck::Start( vtksys_stl::string name, const int*
return result && atLeastOne;
}
-std::vector<vtksys_stl::string>::size_type vtkExodusIIReaderVariableCheck::Length()
+std::vector<std::string>::size_type vtkExodusIIReaderVariableCheck::Length()
{
return this->OriginalNames.size();
}
@@ -38,7 +38,7 @@ int vtkExodusIIReaderVariableCheck::Accept(
std::vector<vtkExodusIIReaderPrivate::ArrayInfoType>& arr,
int startIndex, vtkExodusIIReaderPrivate* priv, int objtyp )
{
- vtksys_stl::string::size_type len = this->Length();
+ std::string::size_type len = this->Length();
vtkExodusIIReaderPrivate::ArrayInfoType ainfo;
ainfo.Name = this->Prefix;
ainfo.Source = vtkExodusIIReaderPrivate::Result;
@@ -113,14 +113,14 @@ vtkExodusIIReaderScalarCheck::vtkExodusIIReaderScalarCheck()
this->GlomType = vtkExodusIIReaderPrivate::Scalar;
}
-bool vtkExodusIIReaderScalarCheck::StartInternal( vtksys_stl::string name, const int*, int )
+bool vtkExodusIIReaderScalarCheck::StartInternal( std::string name, const int*, int )
{
this->Prefix = name;
this->OriginalNames.push_back( name );
return false;
}
-bool vtkExodusIIReaderScalarCheck::Add( vtksys_stl::string, const int* )
+bool vtkExodusIIReaderScalarCheck::Add( std::string, const int* )
{ // Scalars never have more than 1 name
return false;
}
@@ -144,9 +144,9 @@ vtkExodusIIReaderVectorCheck::vtkExodusIIReaderVectorCheck( const char* seq, int
}
}
-bool vtkExodusIIReaderVectorCheck::StartInternal( vtksys_stl::string name, const int*, int )
+bool vtkExodusIIReaderVectorCheck::StartInternal( std::string name, const int*, int )
{
- vtksys_stl::string::size_type len = name.size();
+ std::string::size_type len = name.size();
if ( len > 1 && tolower( name[len - 1] ) == this->Endings[0] )
{
this->Prefix = name.substr( 0, len - 1 );
@@ -159,7 +159,7 @@ bool vtkExodusIIReaderVectorCheck::StartInternal( vtksys_stl::string name, const
return false;
}
-bool vtkExodusIIReaderVectorCheck::Add( vtksys_stl::string name, const int* truth )
+bool vtkExodusIIReaderVectorCheck::Add( std::string name, const int* truth )
{
if (
( ! this->StillAdding ) ||
@@ -169,7 +169,7 @@ bool vtkExodusIIReaderVectorCheck::Add( vtksys_stl::string name, const int* trut
this->StillAdding = false;
return false;
}
- vtksys_stl::string::size_type len = name.size();
+ std::string::size_type len = name.size();
if (
( len != this->Prefix.size() + 1 ) ||
( name.substr( 0, len - 1 ) != this->Prefix ) ||
@@ -183,9 +183,9 @@ bool vtkExodusIIReaderVectorCheck::Add( vtksys_stl::string name, const int* trut
return true;
}
-std::vector<vtksys_stl::string>::size_type vtkExodusIIReaderVectorCheck::Length()
+std::vector<std::string>::size_type vtkExodusIIReaderVectorCheck::Length()
{
- std::vector<vtksys_stl::string>::size_type len = this->OriginalNames.size();
+ std::vector<std::string>::size_type len = this->OriginalNames.size();
return ( len == this->Endings.size() ) ? len : 0;
}
@@ -259,9 +259,9 @@ vtkExodusIIReaderTensorCheck::vtkExodusIIReaderTensorCheck( const char* seq, int
}
}
-bool vtkExodusIIReaderTensorCheck::StartInternal( vtksys_stl::string name, const int*, int )
+bool vtkExodusIIReaderTensorCheck::StartInternal( std::string name, const int*, int )
{
- vtksys_stl::string::size_type len = name.size();
+ std::string::size_type len = name.size();
if ( ( len > (unsigned) this->Rank ) &&
vtksys::SystemTools::LowerCase( name.substr(len - this->Rank ) ) == this->Endings.substr( 0, this->Rank ) )
{
@@ -275,7 +275,7 @@ bool vtkExodusIIReaderTensorCheck::StartInternal( vtksys_stl::string name, const
return false;
}
-bool vtkExodusIIReaderTensorCheck::Add( vtksys_stl::string name, const int* truth )
+bool vtkExodusIIReaderTensorCheck::Add( std::string name, const int* truth )
{
if (
( ! this->StillAdding ) ||
@@ -285,7 +285,7 @@ bool vtkExodusIIReaderTensorCheck::Add( vtksys_stl::string name, const int* trut
this->StillAdding = false;
return false;
}
- vtksys_stl::string::size_type len = name.size();
+ std::string::size_type len = name.size();
if (
( len != this->Prefix.size() + this->Rank ) ||
( name.substr( 0, len - this->Rank ) != this->Prefix ) )
@@ -293,7 +293,7 @@ bool vtkExodusIIReaderTensorCheck::Add( vtksys_stl::string name, const int* trut
this->StillAdding = false;
return false;
}
- vtksys_stl::string::size_type endingOffset = this->OriginalNames.size() * this->Rank;
+ std::string::size_type endingOffset = this->OriginalNames.size() * this->Rank;
if ( vtksys::SystemTools::LowerCase( name.substr( len - this->Rank ) ) != this->Endings.substr( endingOffset, this->Rank ) )
{
this->StillAdding = false;
@@ -304,10 +304,10 @@ bool vtkExodusIIReaderTensorCheck::Add( vtksys_stl::string name, const int* trut
return true;
}
-std::vector<vtksys_stl::string>::size_type vtkExodusIIReaderTensorCheck::Length()
+std::vector<std::string>::size_type vtkExodusIIReaderTensorCheck::Length()
{
- std::vector<vtksys_stl::string>::size_type len = this->OriginalNames.size();
- //std::vector<vtksys_stl::string>::size_type expected = this->Rank * this->Dimension;
+ std::vector<std::string>::size_type len = this->OriginalNames.size();
+ //std::vector<std::string>::size_type expected = this->Rank * this->Dimension;
return ( len == this->NumEndings ) ? len : 0;
}
@@ -317,7 +317,7 @@ vtkExodusIIReaderIntPointCheck::vtkExodusIIReaderIntPointCheck()
this->GlomType = vtkExodusIIReaderPrivate::IntegrationPoint;
}
-bool vtkExodusIIReaderIntPointCheck::StartInternal( vtksys_stl::string name, const int*, int )
+bool vtkExodusIIReaderIntPointCheck::StartInternal( std::string name, const int*, int )
{
if ( this->RegExp.find( name ) )
{
@@ -339,7 +339,7 @@ bool vtkExodusIIReaderIntPointCheck::StartInternal( vtksys_stl::string name, con
return false;
}
-bool vtkExodusIIReaderIntPointCheck::Add( vtksys_stl::string name, const int* )
+bool vtkExodusIIReaderIntPointCheck::Add( std::string name, const int* )
{
if (
( ! this->StillAdding ) ||
@@ -348,8 +348,8 @@ bool vtkExodusIIReaderIntPointCheck::Add( vtksys_stl::string name, const int* )
this->StillAdding = false;
return false;
}
- vtksys_stl::string::size_type nlen = name.size();
- vtksys_stl::string::size_type plen = this->Prefix.size();
+ std::string::size_type nlen = name.size();
+ std::string::size_type plen = this->Prefix.size();
if (
( nlen != plen + this->Rank + 3 /* for "_GP" */ ) ||
( name.substr( 0, plen ) != this->Prefix ) ||
@@ -363,7 +363,7 @@ bool vtkExodusIIReaderIntPointCheck::Add( vtksys_stl::string name, const int* )
return true;
}
-std::vector<vtksys_stl::string>::size_type vtkExodusIIReaderIntPointCheck::Length()
+std::vector<std::string>::size_type vtkExodusIIReaderIntPointCheck::Length()
{
if ( this->IntPtMin.size() != this->IntPtMax.size() )
return 0;
@@ -391,7 +391,7 @@ std::vector<vtkExodusIIReaderPrivate::ArrayInfoType>& arr, int startIndex, vtkEx
*/
bool vtkExodusIIReaderIntPointCheck::StartIntegrationPoints(
- vtksys_stl::string cellType, vtksys_stl::string iptName )
+ std::string cellType, std::string iptName )
{
struct
{
@@ -408,7 +408,7 @@ bool vtkExodusIIReaderIntPointCheck::StartIntegrationPoints(
{ "[Pp][Yy][Rr]", 3 }
};
vtksys::RegularExpression ctrexp;
- vtksys_stl::string::size_type expectedRank = static_cast<vtksys_stl::string::size_type>( -1 );
+ std::string::size_type expectedRank = static_cast<std::string::size_type>( -1 );
for ( unsigned int i = 0; i < sizeof(cellTypes)/sizeof(cellTypes[0]); ++ i )
{
ctrexp.compile( cellTypes[i].RE );
@@ -418,7 +418,7 @@ bool vtkExodusIIReaderIntPointCheck::StartIntegrationPoints(
break;
}
}
- vtksys_stl::string::size_type rank = iptName.size();
+ std::string::size_type rank = iptName.size();
if ( expectedRank > 0 && rank != expectedRank )
{
this->Rank = 0;
@@ -427,7 +427,7 @@ bool vtkExodusIIReaderIntPointCheck::StartIntegrationPoints(
this->Rank = rank;
this->IntPtMin.clear();
this->IntPtMax.clear();
- for ( vtksys_stl::string::size_type i = 0; i < rank; ++ i )
+ for ( std::string::size_type i = 0; i < rank; ++ i )
{
int ival = iptName[i] - '0';
if ( ival < 0 || ival > 9 )
@@ -443,22 +443,22 @@ bool vtkExodusIIReaderIntPointCheck::StartIntegrationPoints(
return true;
}
-bool vtkExodusIIReaderIntPointCheck::AddIntegrationPoint( vtksys_stl::string iptName )
+bool vtkExodusIIReaderIntPointCheck::AddIntegrationPoint( std::string iptName )
{
- vtksys_stl::string::size_type rank = iptName.size();
+ std::string::size_type rank = iptName.size();
if ( rank != this->Rank )
{
this->Rank = 0;
return false;
}
- std::pair<std::set<vtksys_stl::string>::iterator,bool> result;
+ std::pair<std::set<std::string>::iterator,bool> result;
result = this->IntPtNames.insert( iptName );
if ( ! result.second )
{ // Oops, this integration point is a duplicate.
this->Rank = 0;
return false;
}
- for ( vtksys_stl::string::size_type i = 0; i < rank; ++ i )
+ for ( std::string::size_type i = 0; i < rank; ++ i )
{
int ival = iptName[i] - '0';
if ( ival < 0 || ival > 9 )
diff --git a/IO/Exodus/vtkExodusIIReaderVariableCheck.h b/IO/Exodus/vtkExodusIIReaderVariableCheck.h
index d2c949e43572ccea39d1db9838e524e057828831..88417df2c77c5346b0c3546bd273074a4bc14cb9 100644
--- a/IO/Exodus/vtkExodusIIReaderVariableCheck.h
+++ b/IO/Exodus/vtkExodusIIReaderVariableCheck.h
@@ -18,13 +18,13 @@ class vtkExodusIIReaderVariableCheck
{
public:
/// Initialize a sequence of names. Returns true if any more names are acceptable.
- virtual bool Start( vtksys_stl::string name, const int* truth, int numTruth );
+ virtual bool Start( std::string name, const int* truth, int numTruth );
/// Subclasses implement this and returns true if any more names are acceptable.
- virtual bool StartInternal( vtksys_stl::string name, const int* truth, int numTruth ) = 0;
+ virtual bool StartInternal( std::string name, const int* truth, int numTruth ) = 0;
/// Add a name to the sequence. Returns true if any more names may be added.
- virtual bool Add( vtksys_stl::string name, const int* truth ) = 0;
+ virtual bool Add( std::string name, const int* truth ) = 0;
/// Returns the length of the sequence (or 0 if the match is incorrect or incomplete).
- virtual std::vector<vtksys_stl::string>::size_type Length();
+ virtual std::vector<std::string>::size_type Length();
/// Accept this sequence. (Add an entry to the end of \a arr.) Must return Length().
virtual int Accept(
std::vector<vtkExodusIIReaderPrivate::ArrayInfoType>& arr,
@@ -43,8 +43,8 @@ protected:
int GlomType;
std::vector<int> SeqTruth;
- vtksys_stl::string Prefix;
- std::vector<vtksys_stl::string> OriginalNames;
+ std::string Prefix;
+ std::vector<std::string> OriginalNames;
};
/// This always accepts a single array name as a scalar. It is the fallback for all other checkers.
@@ -52,8 +52,8 @@ class vtkExodusIIReaderScalarCheck : public vtkExodusIIReaderVariableCheck
{
public:
vtkExodusIIReaderScalarCheck();
- virtual bool StartInternal( vtksys_stl::string name, const int*, int );
- virtual bool Add( vtksys_stl::string, const int* );
+ virtual bool StartInternal( std::string name, const int*, int );
+ virtual bool Add( std::string, const int* );
};
/// This looks for n-D vectors whose names are identical except for a single final character.
@@ -61,11 +61,11 @@ class vtkExodusIIReaderVectorCheck : public vtkExodusIIReaderVariableCheck
{
public:
vtkExodusIIReaderVectorCheck( const char* seq, int n );
- virtual bool StartInternal( vtksys_stl::string name, const int*, int );
- virtual bool Add( vtksys_stl::string name, const int* truth );
- virtual std::vector<vtksys_stl::string>::size_type Length();
+ virtual bool StartInternal( std::string name, const int*, int );
+ virtual bool Add( std::string name, const int* truth );
+ virtual std::vector<std::string>::size_type Length();
protected:
- vtksys_stl::string Endings;
+ std::string Endings;
bool StillAdding;
};
@@ -79,11 +79,11 @@ class vtkExodusIIReaderTensorCheck : public vtkExodusIIReaderVariableCheck
{
public:
vtkExodusIIReaderTensorCheck( const char* seq, int n, int rank, int dim );
- virtual bool StartInternal( vtksys_stl::string name, const int*, int );
- virtual bool Add( vtksys_stl::string name, const int* truth );
- virtual std::vector<vtksys_stl::string>::size_type Length();
+ virtual bool StartInternal( std::string name, const int*, int );
+ virtual bool Add( std::string name, const int* truth );
+ virtual std::vector<std::string>::size_type Length();
protected:
- vtksys_stl::string Endings;
+ std::string Endings;
vtkTypeUInt64 NumEndings;
int Dimension;
int Rank;
@@ -95,9 +95,9 @@ class vtkExodusIIReaderIntPointCheck : public vtkExodusIIReaderVariableCheck
{
public:
vtkExodusIIReaderIntPointCheck();
- virtual bool StartInternal( vtksys_stl::string name, const int*, int );
- virtual bool Add( vtksys_stl::string name, const int* );
- virtual std::vector<vtksys_stl::string>::size_type Length();
+ virtual bool StartInternal( std::string name, const int*, int );
+ virtual bool Add( std::string name, const int* );
+ virtual std::vector<std::string>::size_type Length();
/*
virtual int Accept(
std::vector<vtkExodusIIReaderPrivate::ArrayInfoType>& arr, int startIndex, vtkExodusIIReaderPrivate* priv, int objtyp )
@@ -105,15 +105,15 @@ public:
}
*/
protected:
- bool StartIntegrationPoints( vtksys_stl::string cellType, vtksys_stl::string iptName );
- bool AddIntegrationPoint( vtksys_stl::string iptName );
+ bool StartIntegrationPoints( std::string cellType, std::string iptName );
+ bool AddIntegrationPoint( std::string iptName );
vtksys::RegularExpression RegExp;
- vtksys_stl::string VarName;
- vtksys_stl::string CellType;
+ std::string VarName;
+ std::string CellType;
std::vector<int> IntPtMin;
std::vector<int> IntPtMax;
- std::set<vtksys_stl::string> IntPtNames;
+ std::set<std::string> IntPtNames;
vtkTypeUInt64 Rank;
bool StillAdding;
};
diff --git a/IO/Export/vtkRIBExporter.cxx b/IO/Export/vtkRIBExporter.cxx
index 946e3f0382025316f766df287aa8dc390ce8c7c8..2388da097ce4af29387b6bd2f40498a8c1c4d1b1 100644
--- a/IO/Export/vtkRIBExporter.cxx
+++ b/IO/Export/vtkRIBExporter.cxx
@@ -832,7 +832,7 @@ void vtkRIBExporter::WritePolygons (vtkPolyData *polyData,
if ( pointData )
{
int cc, aa;
- vtksys_ios::ostringstream str_with_warning_C4701;
+ std::ostringstream str_with_warning_C4701;
for ( cc = 0; cc < pointData->GetNumberOfArrays(); cc ++ )
{
vtkDataArray *array = pointData->GetArray(cc);
@@ -856,7 +856,7 @@ void vtkRIBExporter::WritePolygons (vtkPolyData *polyData,
if ( cellData )
{
int cc, aa;
- vtksys_ios::ostringstream str_with_warning_C4701;
+ std::ostringstream str_with_warning_C4701;
for ( cc = 0; cc < cellData->GetNumberOfArrays(); cc ++ )
{
vtkDataArray *array = cellData->GetArray(cc);
@@ -880,7 +880,7 @@ void vtkRIBExporter::WritePolygons (vtkPolyData *polyData,
if ( fieldData )
{
int cc, aa;
- vtksys_ios::ostringstream str_with_warning_C4701;
+ std::ostringstream str_with_warning_C4701;
for ( cc = 0; cc < fieldData->GetNumberOfArrays(); cc ++ )
{
@@ -1082,7 +1082,7 @@ void vtkRIBExporter::WriteStrips (vtkPolyData *polyData,
if ( pointData )
{
int cc, aa;
- vtksys_ios::ostringstream str_with_warning_C4701;
+ std::ostringstream str_with_warning_C4701;
for ( cc = 0; cc < pointData->GetNumberOfArrays(); cc ++ )
{
vtkDataArray *array = pointData->GetArray(cc);
@@ -1106,7 +1106,7 @@ void vtkRIBExporter::WriteStrips (vtkPolyData *polyData,
if ( cellData )
{
int cc, aa;
- vtksys_ios::ostringstream str_with_warning_C4701;
+ std::ostringstream str_with_warning_C4701;
for ( cc = 0; cc < cellData->GetNumberOfArrays(); cc ++ )
{
vtkDataArray *array = cellData->GetArray(cc);
@@ -1130,7 +1130,7 @@ void vtkRIBExporter::WriteStrips (vtkPolyData *polyData,
if ( fieldData )
{
int cc, aa;
- vtksys_ios::ostringstream str_with_warning_C4701;
+ std::ostringstream str_with_warning_C4701;
for ( cc = 0; cc < fieldData->GetNumberOfArrays(); cc ++ )
{
vtkDataArray *array = fieldData->GetArray(cc);
diff --git a/IO/Export/vtkX3DExporter.cxx b/IO/Export/vtkX3DExporter.cxx
index 51671e4bd4224182440ab39f06392182852f819d..01c91674299b616f615beef6efd549f388a05e69 100644
--- a/IO/Export/vtkX3DExporter.cxx
+++ b/IO/Export/vtkX3DExporter.cxx
@@ -192,7 +192,7 @@ void vtkX3DExporter::WriteData()
writer->StartNode(meta);
writer->SetField(name, "numberofelements");
- vtksys_ios::ostringstream ss;
+ std::ostringstream ss;
ss << ren->GetActors()->GetNumberOfItems();
writer->SetField(content, ss.str().c_str());
writer->EndNode();
@@ -398,8 +398,8 @@ void vtkX3DExporter::WriteAnActor(vtkActor *anActor,
vtkSmartPointer<vtkTransform> trans;
// to be deleted
- vtksys_ios::ostringstream appearance_stream;
- vtksys_ios::ostringstream ostr;
+ std::ostringstream appearance_stream;
+ std::ostringstream ostr;
// see if the actor has a mapper. it could be an assembly
if (anActor->GetMapper() == NULL)
@@ -533,7 +533,7 @@ void vtkX3DExporter::WriteAnActor(vtkActor *anActor,
vtkCellArray* polys = pd->GetPolys();
vtkCellArray* tstrips = pd->GetStrips();
- vtksys_ios::ostringstream geometry_stream;
+ std::ostringstream geometry_stream;
vtkIdType numVerts = verts->GetNumberOfCells();
vtkIdType numLines = lines->GetNumberOfCells();
diff --git a/IO/Export/vtkX3DExporterFIWriter.cxx b/IO/Export/vtkX3DExporterFIWriter.cxx
index 81be3e0ea112c2caccce24781cac2fa6709099d8..b17f7c5a6f35698a34d13b49080ea87d459bb650 100644
--- a/IO/Export/vtkX3DExporterFIWriter.cxx
+++ b/IO/Export/vtkX3DExporterFIWriter.cxx
@@ -127,7 +127,7 @@ int vtkX3DExporterFIByteWriter::OpenStream()
this->WriteToOutputString = 1;
this->CurrentByte = 0;
this->CurrentBytePos = 0;
- this->Stream = new vtksys_ios::ostringstream();
+ this->Stream = new std::ostringstream();
return 1;
}
@@ -136,8 +136,8 @@ const char* vtkX3DExporterFIByteWriter::GetStringStream(int& size)
{
if (this->WriteToOutputString && this->Stream)
{
- vtksys_ios::ostringstream *ostr =
- static_cast<vtksys_ios::ostringstream*>(this->Stream);
+ std::ostringstream *ostr =
+ static_cast<std::ostringstream*>(this->Stream);
size = static_cast<int>(ostr->str().size());
return ostr->str().c_str();
@@ -446,7 +446,7 @@ void vtkX3DExporterFIWriter::EndAttribute()
//----------------------------------------------------------------------------
void vtkX3DExporterFIWriter::SetField(int attributeID, int type, const double* d)
{
- vtksys_ios::ostringstream ss;
+ std::ostringstream ss;
this->StartAttribute(attributeID, true, false);
@@ -504,7 +504,7 @@ void vtkX3DExporterFIWriter::SetField(int attributeID, int type, const double* d
//----------------------------------------------------------------------------
void vtkX3DExporterFIWriter::SetField(int attributeID, int type, vtkDataArray* a)
{
- vtksys_ios::ostringstream ss;
+ std::ostringstream ss;
std::vector<double> values;
this->StartAttribute(attributeID, true, false);
@@ -597,7 +597,7 @@ void vtkX3DExporterFIWriter::SetField(int attributeID,
//----------------------------------------------------------------------------
void vtkX3DExporterFIWriter::SetField(int attributeID, int type, vtkCellArray* a)
{
- vtksys_ios::ostringstream ss;
+ std::ostringstream ss;
std::vector<int> values;
vtkIdType npts = 0;
@@ -650,7 +650,7 @@ void vtkX3DExporterFIWriter::SetField(int attributeID, int type, vtkCellArray* a
//----------------------------------------------------------------------------
void vtkX3DExporterFIWriter::SetField(int attributeID, int value)
{
- vtksys_ios::ostringstream ss;
+ std::ostringstream ss;
this->StartAttribute(attributeID, true, false);
// Xj3D writes out single value fields in string encoding. Expected:
@@ -662,7 +662,7 @@ void vtkX3DExporterFIWriter::SetField(int attributeID, int value)
//----------------------------------------------------------------------------
void vtkX3DExporterFIWriter::SetField(int attributeID, float value)
{
- vtksys_ios::ostringstream ss;
+ std::ostringstream ss;
this->StartAttribute(attributeID, true, false);
diff --git a/IO/Export/vtkX3DExporterXMLWriter.cxx b/IO/Export/vtkX3DExporterXMLWriter.cxx
index 8ba3f5249a12397eca4fdbc62434d4beb951f902..0ddd50cb067eb24e42fd4b1bae62dd0c2b0a6224 100644
--- a/IO/Export/vtkX3DExporterXMLWriter.cxx
+++ b/IO/Export/vtkX3DExporterXMLWriter.cxx
@@ -74,7 +74,7 @@ int vtkX3DExporterXMLWriter::OpenFile(const char* file)
{
this->CloseFile();
this->WriteToOutputString = 0;
- vtksys_ios::fstream* fileStream = new vtksys_ios::fstream();
+ std::fstream* fileStream = new std::fstream();
fileStream->open (file, ios::out);
if(fileStream->fail())
{
@@ -94,7 +94,7 @@ int vtkX3DExporterXMLWriter::OpenStream()
this->CloseFile();
this->WriteToOutputString = 1;
- this->OutputStream = new vtksys_ios::ostringstream();
+ this->OutputStream = new std::ostringstream();
return 1;
}
@@ -105,8 +105,8 @@ void vtkX3DExporterXMLWriter::CloseFile()
{
if(this->WriteToOutputString)
{
- vtksys_ios::ostringstream *ostr =
- static_cast<vtksys_ios::ostringstream*>(this->OutputStream);
+ std::ostringstream *ostr =
+ static_cast<std::ostringstream*>(this->OutputStream);
delete [] this->OutputString;
this->OutputStringLength = static_cast<int>(ostr->str().size());
diff --git a/IO/GeoJSON/vtkGeoJSONWriter.cxx b/IO/GeoJSON/vtkGeoJSONWriter.cxx
index db87a17a968e3f2d17b2ff5b7d74b0bee6c33028..4e6f54a9680bd93e50d17688f6103054ce43ec21 100644
--- a/IO/GeoJSON/vtkGeoJSONWriter.cxx
+++ b/IO/GeoJSON/vtkGeoJSONWriter.cxx
@@ -158,7 +158,7 @@ public:
this->OutputString = NULL;
this->OutputStringLength = 0;
}
- fptr = new vtksys_ios::ostringstream;
+ fptr = new std::ostringstream;
}
if (fptr->fail())
@@ -180,8 +180,8 @@ public:
{
if (this->WriteToOutputString)
{
- vtksys_ios::ostringstream *ostr =
- static_cast<vtksys_ios::ostringstream*>(fp);
+ std::ostringstream *ostr =
+ static_cast<std::ostringstream*>(fp);
delete [] this->OutputString;
this->OutputStringLength = static_cast<int>(ostr->str().size());
diff --git a/IO/Geometry/vtkFLUENTReader.cxx b/IO/Geometry/vtkFLUENTReader.cxx
index 7254b3806f67eb26f9b3ced400d3f0ab30f900cd..5ac96802560d26212dac79d9451e1fa57bc18290 100644
--- a/IO/Geometry/vtkFLUENTReader.cxx
+++ b/IO/Geometry/vtkFLUENTReader.cxx
@@ -2523,7 +2523,7 @@ void vtkFLUENTReader::GetNodesAscii()
size_t dend = this->CaseBuffer->value.find(')', dstart+1);
std::string pdata = this->CaseBuffer->
value.substr(dstart+1, dend-start-1);
- vtksys_ios::stringstream pdatastream(pdata);
+ std::stringstream pdatastream(pdata);
double x, y, z;
if (this->GridDimension == 3)
@@ -2663,7 +2663,7 @@ void vtkFLUENTReader::GetCellsAscii()
size_t dend = this->CaseBuffer->value.find(')', dstart+1);
std::string pdata = this->CaseBuffer->
value.substr(dstart+1, dend-start-1);
- vtksys_ios::stringstream pdatastream(pdata);
+ std::stringstream pdatastream(pdata);
for (int i = firstIndex; i <=lastIndex; i++)
{
pdatastream >> this->Cells->value[i-1].type;
@@ -2749,7 +2749,7 @@ void vtkFLUENTReader::GetFacesAscii()
size_t dend = this->CaseBuffer->value.find(')', dstart+1);
std::string pdata = this->CaseBuffer->
value.substr(dstart+1, dend-start-1);
- vtksys_ios::stringstream pdatastream(pdata);
+ std::stringstream pdatastream(pdata);
int numberOfNodesInFace = 0;
for (int i = firstIndex; i <=lastIndex; i++)
@@ -2868,7 +2868,7 @@ void vtkFLUENTReader::GetPeriodicShadowFacesAscii()
size_t dstart = this->CaseBuffer->value.find('(', 7);
size_t dend = this->CaseBuffer->value.find(')', dstart+1);
std::string pdata = this->CaseBuffer->value.substr(dstart+1, dend-start-1);
- vtksys_ios::stringstream pdatastream(pdata);
+ std::stringstream pdatastream(pdata);
int faceIndex1, faceIndex2;
for (int i = firstIndex; i <=lastIndex; i++)
@@ -2917,7 +2917,7 @@ void vtkFLUENTReader::GetCellTreeAscii()
size_t dstart = this->CaseBuffer->value.find('(', 7);
size_t dend = this->CaseBuffer->value.find(')', dstart+1);
std::string pdata = this->CaseBuffer->value.substr(dstart+1, dend-start-1);
- vtksys_ios::stringstream pdatastream(pdata);
+ std::stringstream pdatastream(pdata);
int numberOfKids, kid;
for (int i = cellId0; i <=cellId1; i++)
@@ -2974,7 +2974,7 @@ void vtkFLUENTReader::GetFaceTreeAscii()
size_t dstart = this->CaseBuffer->value.find('(', 7);
size_t dend = this->CaseBuffer->value.find(')', dstart+1);
std::string pdata = this->CaseBuffer->value.substr(dstart+1, dend-start-1);
- vtksys_ios::stringstream pdatastream(pdata);
+ std::stringstream pdatastream(pdata);
int numberOfKids, kid;
for (int i = faceId0; i <=faceId1; i++)
@@ -3029,7 +3029,7 @@ void vtkFLUENTReader::GetInterfaceFaceParentsAscii()
size_t dstart = this->CaseBuffer->value.find('(', 7);
size_t dend = this->CaseBuffer->value.find(')', dstart+1);
std::string pdata = this->CaseBuffer->value.substr(dstart+1, dend-start-1);
- vtksys_ios::stringstream pdatastream(pdata);
+ std::stringstream pdatastream(pdata);
int parentId0, parentId1;
for (int i = faceId0; i <=faceId1; i++)
@@ -3082,7 +3082,7 @@ void vtkFLUENTReader::GetNonconformalGridInterfaceFaceInformationAscii()
size_t dstart = this->CaseBuffer->value.find('(', 7);
size_t dend = this->CaseBuffer->value.find(')', dstart+1);
std::string pdata = this->CaseBuffer->value.substr(dstart+1, dend-start-1);
- vtksys_ios::stringstream pdatastream(pdata);
+ std::stringstream pdatastream(pdata);
int child, parent;
for (int i = 0; i < numberOfFaces; i++)
@@ -4035,7 +4035,7 @@ void vtkFLUENTReader::GetData(int dataType)
size_t start = this->DataBuffer->value.find('(', 1);
size_t end = this->DataBuffer->value.find(')',1);
std::string info = this->DataBuffer->value.substr(start+1,end-start-1 );
- vtksys_ios::stringstream infostream(info);
+ std::stringstream infostream(info);
int subSectionId, zoneId, size, nTimeLevels, nPhases, firstId, lastId;
infostream >> subSectionId >> zoneId >> size >> nTimeLevels >> nPhases >>
firstId >> lastId;
@@ -4058,7 +4058,7 @@ void vtkFLUENTReader::GetData(int dataType)
size_t dend = this->DataBuffer->value.find(')', dstart+1);
std::string pdata = this->DataBuffer->
value.substr(dstart+1, dend-dstart-2);
- vtksys_ios::stringstream pdatastream(pdata);
+ std::stringstream pdatastream(pdata);
size_t ptr = dstart + 1;
// Is this a new variable?
@@ -4253,7 +4253,7 @@ void vtkFLUENTReader::GetSpeciesVariableNames()
size_t endPos = variables.find(")");
variables.erase(endPos);
- vtksys_ios::stringstream tokenizer(variables);
+ std::stringstream tokenizer(variables);
int iterator = 0;
diff --git a/IO/Geometry/vtkOpenFOAMReader.cxx b/IO/Geometry/vtkOpenFOAMReader.cxx
index fec98b5f938f968a4699b7b56b34986a3c2201ee..09d6f0cba8f7c7f876f2616589ce44185cb5a43d 100644
--- a/IO/Geometry/vtkOpenFOAMReader.cxx
+++ b/IO/Geometry/vtkOpenFOAMReader.cxx
@@ -427,10 +427,10 @@ private:
public:
// a super-easy way to make use of operator<<()'s defined in
- // vtksys_ios::ostringstream class
+ // std::ostringstream class
template <class T> vtkFoamError& operator<<(const T& t)
{
- vtksys_ios::ostringstream os;
+ std::ostringstream os;
os << t;
this->Superclass::operator+=(os.str());
return *this;
@@ -639,7 +639,7 @@ public:
return !this->operator==(value);
}
- friend vtksys_ios::ostringstream& operator<<(vtksys_ios::ostringstream& str,
+ friend std::ostringstream& operator<<(std::ostringstream& str,
const vtkFoamToken& value)
{
switch (value.GetType())
@@ -828,7 +828,7 @@ private:
vtkFoamError StackString()
{
- vtksys_ios::ostringstream os;
+ std::ostringstream os;
if (this->StackI > 0)
{
os << "\n included";
@@ -4264,31 +4264,31 @@ bool vtkOpenFOAMReaderPrivate::ListTimeDirectoriesByControlDict(
// determine time name based on Foam::Time::timeName()
// cf. src/OpenFOAM/db/Time/Time.C
- vtksys_ios::ostringstream parser;
+ std::ostringstream parser;
#ifdef _MSC_VER
bool correctExponent = true;
#endif
if (timeFormat == "general")
{
- parser.setf(vtksys_ios::ios_base::fmtflags(0), vtksys_ios::ios_base::floatfield);
+ parser.setf(std::ios_base::fmtflags(0), std::ios_base::floatfield);
}
else if (timeFormat == "fixed")
{
- parser.setf(vtksys_ios::ios_base::fmtflags(vtksys_ios::ios_base::fixed),
- vtksys_ios::ios_base::floatfield);
+ parser.setf(std::ios_base::fmtflags(std::ios_base::fixed),
+ std::ios_base::floatfield);
#ifdef _MSC_VER
correctExponent = false;
#endif
}
else if (timeFormat == "scientific")
{
- parser.setf(vtksys_ios::ios_base::fmtflags(vtksys_ios::ios_base::scientific),
- vtksys_ios::ios_base::floatfield);
+ parser.setf(std::ios_base::fmtflags(std::ios_base::scientific),
+ std::ios_base::floatfield);
}
else
{
vtkWarningMacro("Warning: unsupported time format. Assuming general.");
- parser.setf(vtksys_ios::ios_base::fmtflags(0), vtksys_ios::ios_base::floatfield);
+ parser.setf(std::ios_base::fmtflags(0), std::ios_base::floatfield);
}
parser.precision(timePrecision);
@@ -6675,7 +6675,7 @@ void vtkOpenFOAMReaderPrivate::ConstructDimensions(vtkStdString *dimString,
}
static const char *units[7] =
{ "kg", "m", "s", "K", "mol", "A", "cd" };
- vtksys_ios::ostringstream posDim, negDim;
+ std::ostringstream posDim, negDim;
int posSpc = 0, negSpc = 0;
if (dimSet[0] == 1 && dimSet[1] == -1 && dimSet[2] == -2)
{
diff --git a/IO/Geometry/vtkParticleReader.cxx b/IO/Geometry/vtkParticleReader.cxx
index 97a86866aceba7760389251cdec130116fc98cac..af71e295edd9ad18c5ead6dce558b84aeb2fc9a4 100644
--- a/IO/Geometry/vtkParticleReader.cxx
+++ b/IO/Geometry/vtkParticleReader.cxx
@@ -93,7 +93,7 @@ namespace {
std::replace(s.begin(),s.end(),',','\t');
// We have data.
- vtksys_ios::stringstream is;
+ std::stringstream is;
is << s.c_str();
is >> val[0] >> val[1] >> val[2] >> val[3];
diff --git a/IO/Image/vtkMedicalImageProperties.cxx b/IO/Image/vtkMedicalImageProperties.cxx
index ba1640a6c083942b4d71384034b07516027e0694..92fd3a1a53e02bfe7aeee426b2639e4685db68dc 100644
--- a/IO/Image/vtkMedicalImageProperties.cxx
+++ b/IO/Image/vtkMedicalImageProperties.cxx
@@ -15,10 +15,11 @@
#include "vtkMedicalImageProperties.h"
#include "vtkObjectFactory.h"
-#include <vtksys/stl/string>
-#include <vtksys/stl/map>
-#include <vtksys/stl/vector>
-#include <vtksys/stl/set>
+#include <string>
+#include <map>
+#include <vector>
+#include <set>
+
#include <ctime> // for strftime
#include <ctype.h> // for isdigit
#include <cassert>
@@ -43,7 +44,7 @@ public:
public:
double Window;
double Level;
- vtksys_stl::string Comment;
+ std::string Comment;
};
class UserDefinedValue
diff --git a/IO/Infovis/vtkChacoGraphReader.cxx b/IO/Infovis/vtkChacoGraphReader.cxx
index 8b66900d44006be1689c79a2d9a065307ee95f7a..6e95312a13fb41dd0327585097de1b79abb76160 100644
--- a/IO/Infovis/vtkChacoGraphReader.cxx
+++ b/IO/Infovis/vtkChacoGraphReader.cxx
@@ -62,7 +62,7 @@
// myself.
// This function is also defined in Infovis/vtkDelimitedTextReader.cxx,
// so it would be nice to put this in a common file.
-static int my_getline(vtksys_ios::istream& stream, vtkStdString &output, char delim='\n');
+static int my_getline(std::istream& stream, vtkStdString &output, char delim='\n');
vtkStandardNewMacro(vtkChacoGraphReader);
@@ -78,7 +78,7 @@ vtkChacoGraphReader::~vtkChacoGraphReader()
this->SetFileName(0);
}
-void vtkChacoGraphReader::PrintSelf(vtksys_ios::ostream& os, vtkIndent indent)
+void vtkChacoGraphReader::PrintSelf(std::ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
@@ -97,7 +97,7 @@ int vtkChacoGraphReader::RequestData(
return 0;
}
- vtksys_ios::ifstream fin(this->FileName);
+ std::ifstream fin(this->FileName);
if(!fin.is_open())
{
vtkErrorMacro("Could not open file " << this->FileName << ".");
@@ -110,7 +110,7 @@ int vtkChacoGraphReader::RequestData(
// Get the header line
vtkStdString line;
my_getline(fin, line);
- vtksys_ios::stringstream firstLine;
+ std::stringstream firstLine;
firstLine << line;
vtkIdType numVerts;
vtkIdType numEdges;
@@ -128,7 +128,7 @@ int vtkChacoGraphReader::RequestData(
vtkIntArray** vertArr = new vtkIntArray*[vertWeights];
for (int vw = 0; vw < vertWeights; vw++)
{
- vtksys_ios::ostringstream oss;
+ std::ostringstream oss;
oss << "weight " << (vw+1);
vertArr[vw] = vtkIntArray::New();
vertArr[vw]->SetName(oss.str().c_str());
@@ -138,7 +138,7 @@ int vtkChacoGraphReader::RequestData(
vtkIntArray** edgeArr = new vtkIntArray*[edgeWeights];
for (int ew = 0; ew < edgeWeights; ew++)
{
- vtksys_ios::ostringstream oss;
+ std::ostringstream oss;
oss << "weight " << (ew+1);
edgeArr[ew] = vtkIntArray::New();
edgeArr[ew]->SetName(oss.str().c_str());
@@ -156,7 +156,7 @@ int vtkChacoGraphReader::RequestData(
for (vtkIdType u = 0; u < numVerts; u++)
{
my_getline(fin, line);
- vtksys_ios::stringstream stream;
+ std::stringstream stream;
stream << line;
//cerr << "read line " << stream.str() << endl;
int weight;
@@ -204,7 +204,7 @@ int vtkChacoGraphReader::RequestData(
}
static int
-my_getline(vtksys_ios::istream& in, vtkStdString &out, char delimiter)
+my_getline(std::istream& in, vtkStdString &out, char delimiter)
{
out = vtkStdString();
unsigned int numCharactersRead = 0;
diff --git a/IO/Infovis/vtkDIMACSGraphReader.cxx b/IO/Infovis/vtkDIMACSGraphReader.cxx
index 4ea16214701f0f13643792d541e09273788c2c89..1b1c38a41e4596b474ecb425a750d0c9fcf5a17c 100644
--- a/IO/Infovis/vtkDIMACSGraphReader.cxx
+++ b/IO/Infovis/vtkDIMACSGraphReader.cxx
@@ -35,8 +35,8 @@
#include <vtksys/ios/fstream>
#include <vtksys/ios/sstream>
#include <vtksys/ios/iostream>
-using vtksys_ios::ifstream;
-using vtksys_ios::istringstream;
+using std::ifstream;
+using std::istringstream;
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
diff --git a/IO/Infovis/vtkFixedWidthTextReader.cxx b/IO/Infovis/vtkFixedWidthTextReader.cxx
index 2a76a48ce4f55d2db2ea530cd5a46968ad9b5afc..27b87dff4c01d8896a3442806d7a61e7e76b4234 100644
--- a/IO/Infovis/vtkFixedWidthTextReader.cxx
+++ b/IO/Infovis/vtkFixedWidthTextReader.cxx
@@ -29,9 +29,9 @@
#include "vtkStdString.h"
#include "vtkIOStream.h"
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/vector>
-#include <vtksys/ios/fstream>
+#include <algorithm>
+#include <vector>
+#include <fstream>
#include <ctype.h>
@@ -41,14 +41,14 @@ vtkStandardNewMacro(vtkFixedWidthTextReader);
static int splitString(const vtkStdString& input,
unsigned int fieldWidth,
bool stripWhitespace,
- vtksys_stl::vector<vtkStdString>& results,
+ std::vector<vtkStdString>& results,
bool includeEmpties=true);
// I need a safe way to read a line of arbitrary length. It exists on
// some platforms but not others so I'm afraid I have to write it
// myself.
-static int my_getline(istream& stream, vtkStdString &output, char delim='\n');
+static int my_getline(std::istream& stream, vtkStdString &output, char delim='\n');
// ----------------------------------------------------------------------
@@ -99,7 +99,7 @@ int vtkFixedWidthTextReader::RequestData(
return 2;
}
- vtksys_ios::ifstream infile(this->FileName, ios::in);
+ std::ifstream infile(this->FileName, ios::in);
if (!infile || infile.fail())
{
vtkErrorMacro(<<"vtkFixedWidthTextReader: Couldn't open file!");
@@ -109,8 +109,8 @@ int vtkFixedWidthTextReader::RequestData(
// The first line of the file might contain the headers, so we want
// to be a little bit careful about it. If we don't have headers
// we'll have to make something up.
- vtksys_stl::vector<vtkStdString> headers;
- vtksys_stl::vector<vtkStdString> firstLineFields;
+ std::vector<vtkStdString> headers;
+ std::vector<vtkStdString> firstLineFields;
vtkStdString firstLine;
my_getline(infile, firstLine);
@@ -146,7 +146,7 @@ int vtkFixedWidthTextReader::RequestData(
// Now we can create the arrays that will hold the data for each
// field.
- vtksys_stl::vector<vtkStdString>::const_iterator fieldIter;
+ std::vector<vtkStdString>::const_iterator fieldIter;
for(fieldIter = headers.begin(); fieldIter != headers.end(); ++fieldIter)
{
vtkStringArray* array = vtkStringArray::New();
@@ -160,7 +160,7 @@ int vtkFixedWidthTextReader::RequestData(
if (!this->HaveHeaders)
{
vtkVariantArray* dataArray = vtkVariantArray::New();
- vtksys_stl::vector<vtkStdString>::const_iterator I;
+ std::vector<vtkStdString>::const_iterator I;
for(I = firstLineFields.begin(); I != firstLineFields.end(); ++I)
{
dataArray->InsertNextValue(vtkVariant(*I));
@@ -183,7 +183,7 @@ int vtkFixedWidthTextReader::RequestData(
}
vtkDebugMacro(<<"Next line: " << nextLine.c_str());
- vtksys_stl::vector<vtkStdString> dataVector;
+ std::vector<vtkStdString> dataVector;
// Split string on the delimiters
splitString(nextLine,
@@ -196,7 +196,7 @@ int vtkFixedWidthTextReader::RequestData(
// Convert from vector to variant array
vtkVariantArray* dataArray = vtkVariantArray::New();
- vtksys_stl::vector<vtkStdString>::const_iterator I;
+ std::vector<vtkStdString>::const_iterator I;
for(I = dataVector.begin(); I != dataVector.end(); ++I)
{
dataArray->InsertNextValue(vtkVariant(*I));
@@ -224,7 +224,7 @@ static int
splitString(const vtkStdString& input,
unsigned int fieldWidth,
bool stripWhitespace,
- vtksys_stl::vector<vtkStdString>& results,
+ std::vector<vtkStdString>& results,
bool includeEmpties)
{
if (input.size() == 0)
diff --git a/IO/Infovis/vtkTulipReader.cxx b/IO/Infovis/vtkTulipReader.cxx
index 3b478321b969413a2da083a1b3111b1bce3612eb..934868f3be57c315f41eb35a7a5e77ccd1f35c89 100644
--- a/IO/Infovis/vtkTulipReader.cxx
+++ b/IO/Infovis/vtkTulipReader.cxx
@@ -39,12 +39,12 @@
#include "vtkVariantArray.h"
#include <cassert>
-#include <vtksys/ios/fstream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/map>
-#include <vtksys/stl/set>
-#include <vtksys/stl/stack>
-#include <vtksys/stl/vector>
+#include <fstream>
+#include <sstream>
+#include <map>
+#include <set>
+#include <stack>
+#include <vector>
#if defined (__BORLANDC__)
#include <ctype.h> // for isspace, isdigit
@@ -55,7 +55,7 @@
// myself.
// This function is also defined in Infovis/vtkDelimitedTextReader.cxx,
// so it would be nice to put this in a common file.
-static int my_getline(vtksys_ios::istream& stream, vtkStdString &output, char delim='\n');
+static int my_getline(std::istream& stream, vtkStdString &output, char delim='\n');
vtkStandardNewMacro(vtkTulipReader);
@@ -72,7 +72,7 @@ vtkTulipReader::~vtkTulipReader()
this->SetFileName(0);
}
-void vtkTulipReader::PrintSelf(vtksys_ios::ostream& os, vtkIndent indent)
+void vtkTulipReader::PrintSelf(std::ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
@@ -123,7 +123,7 @@ struct vtkTulipReaderToken
double DoubleValue;
};
-static void vtkTulipReaderNextToken(vtksys_ios::istream& in, vtkTulipReaderToken& tok)
+static void vtkTulipReaderNextToken(std::istream& in, vtkTulipReaderToken& tok)
{
char ch = in.peek();
while (!in.eof() && (ch == ';' || isspace(ch)))
@@ -159,7 +159,7 @@ static void vtkTulipReaderNextToken(vtksys_ios::istream& in, vtkTulipReaderToken
else if (isdigit(ch) || ch == '.')
{
bool isDouble = false;
- vtksys_ios::stringstream ss;
+ std::stringstream ss;
while (isdigit(ch) || ch == '.')
{
in.get();
@@ -208,7 +208,7 @@ int vtkTulipReader::RequestData(
return 0;
}
- vtksys_ios::ifstream fin(this->FileName);
+ std::ifstream fin(this->FileName);
if(!fin.is_open())
{
vtkErrorMacro("Could not open file " << this->FileName << ".");
@@ -230,19 +230,19 @@ int vtkTulipReader::RequestData(
edgePedigrees->SetName("id");
// Structures to record cluster hierarchy - all vertices belong to cluster 0.
- vtksys_stl::vector<vtkTulipReaderCluster> clusters;
+ std::vector<vtkTulipReaderCluster> clusters;
vtkTulipReaderCluster root;
root.clusterId = 0;
root.parentId = vtkTulipReaderCluster::NO_PARENT;
root.name = "<default>";
root.nodes = vtkSmartPointer<vtkIdTypeArray>::New();
- vtksys_stl::stack<int> parentage;
+ std::stack<int> parentage;
parentage.push(root.clusterId);
clusters.push_back(root);
- vtksys_stl::map<int, vtkIdType> nodeIdMap;
- vtksys_stl::map<int, vtkIdType> edgeIdMap;
+ std::map<int, vtkIdType> nodeIdMap;
+ std::map<int, vtkIdType> edgeIdMap;
vtkTulipReaderToken tok;
vtkTulipReaderNextToken(fin, tok);
while (tok.Type == vtkTulipReaderToken::OPEN_PAREN)
@@ -437,7 +437,7 @@ int vtkTulipReader::RequestData(
int id = tok.IntValue;
vtkTulipReaderNextToken(fin, tok);
assert(tok.Type == vtkTulipReaderToken::TEXT);
- vtksys_ios::stringstream ss;
+ std::stringstream ss;
int value;
ss << tok.StringValue;
ss >> value;
@@ -488,7 +488,7 @@ int vtkTulipReader::RequestData(
int id = tok.IntValue;
vtkTulipReaderNextToken(fin, tok);
assert(tok.Type == vtkTulipReaderToken::TEXT);
- vtksys_ios::stringstream ss;
+ std::stringstream ss;
double value;
ss << tok.StringValue;
ss >> value;
@@ -616,7 +616,7 @@ int vtkTulipReader::RequestData(
}
static int
-my_getline(vtksys_ios::istream& in, vtkStdString &out, char delimiter)
+my_getline(std::istream& in, vtkStdString &out, char delimiter)
{
out = vtkStdString();
unsigned int numCharactersRead = 0;
diff --git a/IO/Infovis/vtkXGMLReader.cxx b/IO/Infovis/vtkXGMLReader.cxx
index c8667893d130c1a0521e22a00c465c471989e843..71d6114c6c4130bd0b714bd18ca79dd08597e43d 100644
--- a/IO/Infovis/vtkXGMLReader.cxx
+++ b/IO/Infovis/vtkXGMLReader.cxx
@@ -36,16 +36,16 @@ PURPOSE. See the above copyright notice for more information.
#include <cassert>
-#include <vtksys/ios/fstream>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/map>
+#include <fstream>
+#include <sstream>
+#include <map>
#if defined (__BORLANDC__)
#include <ctype.h> // for isspace, isdigit
#endif
// Copied from vtkTulipReader.cxx ..
-static int my_getline(vtksys_ios::istream& stream, vtkStdString &output, char delim='\n');
+static int my_getline(std::istream& stream, vtkStdString &output, char delim='\n');
vtkStandardNewMacro(vtkXGMLReader);
@@ -61,7 +61,7 @@ vtkXGMLReader::~vtkXGMLReader()
this->SetFileName(0);
}
-void vtkXGMLReader::PrintSelf(vtksys_ios::ostream& os, vtkIndent indent)
+void vtkXGMLReader::PrintSelf(std::ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
@@ -100,7 +100,7 @@ struct vtkXGMLReaderToken
-static void vtkXGMLReaderNextToken(vtksys_ios::istream& in, vtkXGMLReaderToken& tok)
+static void vtkXGMLReaderNextToken(std::istream& in, vtkXGMLReaderToken& tok)
{
char ch = in.peek();
while (!in.eof() && (ch == ';' || isspace(ch)))
@@ -136,7 +136,7 @@ static void vtkXGMLReaderNextToken(vtksys_ios::istream& in, vtkXGMLReaderToken&
else if (isdigit(ch) || ch == '.')
{
bool isDouble = false;
- vtksys_ios::stringstream ss;
+ std::stringstream ss;
while (isdigit(ch) || ch == '.')
{
in.get();
@@ -197,7 +197,7 @@ int vtkXGMLReader::RequestData(
return 0;
}
- vtksys_ios::ifstream fin(this->FileName);
+ std::ifstream fin(this->FileName);
if(!fin.is_open())
{
vtkErrorMacro("Could not open file " << this->FileName << ".");
@@ -208,8 +208,8 @@ int vtkXGMLReader::RequestData(
vtkSmartPointer<vtkMutableUndirectedGraph> builder =
vtkSmartPointer<vtkMutableUndirectedGraph>::New();
- vtksys_stl::map<int, vtkIdType> nodeIdMap;
- vtksys_stl::map<int, vtkIdType> edgeIdMap;
+ std::map<int, vtkIdType> nodeIdMap;
+ std::map<int, vtkIdType> edgeIdMap;
vtkXGMLReaderToken tok;
// expect graph
@@ -471,7 +471,7 @@ int vtkXGMLReader::RequestData(
}
static int
-my_getline(vtksys_ios::istream& in, vtkStdString &out, char delimiter)
+my_getline(std::istream& in, vtkStdString &out, char delimiter)
{
out = vtkStdString();
unsigned int numCharactersRead = 0;
diff --git a/IO/Legacy/vtkCompositeDataReader.cxx b/IO/Legacy/vtkCompositeDataReader.cxx
index ab655ee96b85f1a750702d7a169f5b52adf429c8..b36934137f34717814402b8df667c0a22b4fcb20 100644
--- a/IO/Legacy/vtkCompositeDataReader.cxx
+++ b/IO/Legacy/vtkCompositeDataReader.cxx
@@ -585,7 +585,7 @@ vtkDataObject* vtkCompositeDataReader::ReadChild()
unsigned int child_stack_depth = 1;
- vtksys_ios::ostringstream child_data;
+ std::ostringstream child_data;
char line[512];
while (child_stack_depth > 0)
// read until ENDCHILD (passing over any nested CHILD-ENDCHILD correctly).
diff --git a/IO/Legacy/vtkDataReader.cxx b/IO/Legacy/vtkDataReader.cxx
index 0b6065760c5c032a667775aa720d0df8d8fff8a6..520a2178b74b8735f53fc7e60c3b9be900d318e8 100644
--- a/IO/Legacy/vtkDataReader.cxx
+++ b/IO/Legacy/vtkDataReader.cxx
@@ -400,14 +400,14 @@ int vtkDataReader::OpenVTKFile()
std::string str(this->InputArray->GetPointer(0),
static_cast<size_t>( this->InputArray->GetNumberOfTuples() *
this->InputArray->GetNumberOfComponents()) );
- this->IS = new vtksys_ios::istringstream(str);
+ this->IS = new std::istringstream(str);
return 1;
}
else if (this->InputString)
{
vtkDebugMacro(<< "Reading from InputString");
std::string str(this->InputString, this->InputStringLength);
- this->IS = new vtksys_ios::istringstream(str);
+ this->IS = new std::istringstream(str);
return 1;
}
}
@@ -3289,7 +3289,7 @@ int vtkDataReader::DecodeString(char *resname, const char* name)
{
return 0;
}
- vtksys_ios::ostringstream str;
+ std::ostringstream str;
size_t cc = 0;
unsigned int ch;
size_t len = strlen(name);
diff --git a/IO/Legacy/vtkDataWriter.cxx b/IO/Legacy/vtkDataWriter.cxx
index c54a1fe0a8e9230730eb1c05f163fb6ceb44ff8e..f3684a543df1027b994bcf20d50f7108ea54afd4 100644
--- a/IO/Legacy/vtkDataWriter.cxx
+++ b/IO/Legacy/vtkDataWriter.cxx
@@ -140,7 +140,7 @@ ostream *vtkDataWriter::OpenVTKFile()
/// static_cast<int> (500+ 1024 * input->GetActualMemorySize());
/// this->OutputString = new char[this->OutputStringAllocatedLength];
- fptr = new vtksys_ios::ostringstream;
+ fptr = new std::ostringstream;
}
else
{
@@ -1931,8 +1931,8 @@ void vtkDataWriter::CloseVTKFile(ostream *fp)
{
if (this->WriteToOutputString)
{
- vtksys_ios::ostringstream *ostr =
- static_cast<vtksys_ios::ostringstream*>(fp);
+ std::ostringstream *ostr =
+ static_cast<std::ostringstream*>(fp);
delete [] this->OutputString;
this->OutputStringLength = static_cast<int>(ostr->str().size());
diff --git a/IO/MINC/vtkMINCImageAttributes.cxx b/IO/MINC/vtkMINCImageAttributes.cxx
index fcca1c0f430c9b644fb9f63f2a7c56d53e42a679..8112945372e7472a88c498a2d87e8486e27434d7 100644
--- a/IO/MINC/vtkMINCImageAttributes.cxx
+++ b/IO/MINC/vtkMINCImageAttributes.cxx
@@ -302,7 +302,7 @@ const char *vtkMINCImageAttributes::ConvertDataArrayToString(
return charArray->GetPointer(0);
}
- vtksys_ios::ostringstream os;
+ std::ostringstream os;
int n = array->GetNumberOfTuples();
int i = 0;
diff --git a/IO/MySQL/vtkMySQLDatabase.cxx b/IO/MySQL/vtkMySQLDatabase.cxx
index c313b032612a07c6d8e58e9700271d79136c27e1..66334000bffd57a98fd076f437930f979e4ae90f 100644
--- a/IO/MySQL/vtkMySQLDatabase.cxx
+++ b/IO/MySQL/vtkMySQLDatabase.cxx
@@ -334,7 +334,7 @@ vtkStdString vtkMySQLDatabase::GetURL()
this->GetServerPort() != VTK_MYSQL_DEFAULT_PORT
)
{
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
stream << ":" << this->GetServerPort();
url += stream.str();
}
@@ -389,7 +389,7 @@ vtkStdString vtkMySQLDatabase::GetColumnSpecification( vtkSQLDatabaseSchema* sch
int colHandle )
{
// With MySQL, the column name must be enclosed between backquotes
- vtksys_ios::ostringstream queryStr;
+ std::ostringstream queryStr;
queryStr << "`" << schema->GetColumnNameFromHandle( tblHandle, colHandle ) << "` ";
// Figure out column type
diff --git a/IO/MySQL/vtkMySQLQuery.cxx b/IO/MySQL/vtkMySQLQuery.cxx
index 339cc2aa25806aadb8f4df5378e2f627051c119b..a97b5891dfcfcd3c97b999ef43ad8de523ec3142 100644
--- a/IO/MySQL/vtkMySQLQuery.cxx
+++ b/IO/MySQL/vtkMySQLQuery.cxx
@@ -36,8 +36,8 @@
#include <cassert>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/vector>
+#include <sstream>
+#include <vector>
/*
* Bound Parameters and MySQL
@@ -282,7 +282,7 @@ public:
MYSQL_ROW CurrentRow;
unsigned long *CurrentLengths;
- typedef vtksys_stl::vector<vtkMySQLBoundParameter *> ParameterList;
+ typedef std::vector<vtkMySQLBoundParameter *> ParameterList;
ParameterList UserParameterList;
};
diff --git a/IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx b/IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx
index e91685a9bb4c17368b7f8338da3648f84df188e9..82608535647ea5a54102489d8a667647bf73c013 100644
--- a/IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx
+++ b/IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx
@@ -63,7 +63,7 @@ int TestODBCDatabase( int, char ** const )
int i;
for ( i = 0; i < 20; ++ i )
{
- vtksys_ios::ostringstream queryBuf;
+ std::ostringstream queryBuf;
queryBuf << "INSERT INTO people VALUES('John Doe "
<< i
diff --git a/IO/ODBC/vtkODBCDatabase.cxx b/IO/ODBC/vtkODBCDatabase.cxx
index 24f71688fd87536f94cc00ab3e87289387da1318..304124a76f2a5d594bc59f1f869adff0904d2b13 100644
--- a/IO/ODBC/vtkODBCDatabase.cxx
+++ b/IO/ODBC/vtkODBCDatabase.cxx
@@ -66,7 +66,7 @@ static vtkStdString GetErrorMessage(SQLSMALLINT handleType,
// There may be several error messages queued up so we need to loop
// until we've got everything.
- vtksys_ios::ostringstream messagebuf;
+ std::ostringstream messagebuf;
do
{
status = SQLGetDiagRec(handleType, handle,
@@ -294,7 +294,7 @@ bool vtkODBCDatabase::Open(const char *password)
{
// We don't actually have a valid SQL handle yet so I don't think
// we can actually retrieve an error message.
- vtksys_ios::ostringstream sbuf;
+ std::ostringstream sbuf;
sbuf << "vtkODBCDatabase::Open: Unable to allocate environment handle. "
<< "Return code " << status << ", error message: "
<< GetErrorMessage(SQL_HANDLE_ENV,
@@ -353,7 +353,7 @@ bool vtkODBCDatabase::Open(const char *password)
if (status != SQL_SUCCESS && status != SQL_SUCCESS_WITH_INFO)
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "Error allocating ODBC connection handle: "
<< GetErrorMessage(SQL_HANDLE_ENV, this->Internals->Environment);
this->SetLastErrorText(errbuf.str().c_str());
@@ -372,7 +372,7 @@ bool vtkODBCDatabase::Open(const char *password)
driverName.size());
if (status != SQL_SUCCESS && status != SQL_SUCCESS_WITH_INFO)
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "Error setting driver name: "
<< GetErrorMessage(SQL_HANDLE_DBC, this->Internals->Connection);
this->SetLastErrorText(errbuf.str().c_str());
@@ -397,7 +397,7 @@ bool vtkODBCDatabase::Open(const char *password)
if (status != SQL_SUCCESS && status != SQL_SUCCESS_WITH_INFO)
{
- vtksys_ios::ostringstream sbuf;
+ std::ostringstream sbuf;
sbuf << "vtkODBCDatabase::Open: Error during connection: "
<< GetErrorMessage(SQL_HANDLE_DBC, this->Internals->Connection);
this->SetLastErrorText(sbuf.str().c_str());
@@ -718,7 +718,7 @@ vtkStdString vtkODBCDatabase::GetColumnSpecification(
int tblHandle,
int colHandle)
{
- vtksys_ios::ostringstream queryStr;
+ std::ostringstream queryStr;
queryStr << schema->GetColumnNameFromHandle( tblHandle, colHandle ) << " ";
// Figure out column type
diff --git a/IO/ODBC/vtkODBCQuery.cxx b/IO/ODBC/vtkODBCQuery.cxx
index 8b481315c0cf4c1e7559c2032f8087eb6dea7003..ba334ff77c9b5f3f59277dbf74b69428f2ae8543 100644
--- a/IO/ODBC/vtkODBCQuery.cxx
+++ b/IO/ODBC/vtkODBCQuery.cxx
@@ -37,8 +37,8 @@
#include <cassert>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/vector>
+#include <sstream>
+#include <vector>
#include <sql.h>
#include <sqlext.h>
@@ -155,7 +155,7 @@ public:
vtkBitArray *NullPermitted;
SQLSMALLINT *ColumnTypes;
- typedef vtksys_stl::vector<vtkODBCBoundParameter *> ParameterList;
+ typedef std::vector<vtkODBCBoundParameter *> ParameterList;
ParameterList UserParameterList;
};
@@ -171,7 +171,7 @@ vtkODBCQueryInternals::FreeStatement()
status = SQLCloseCursor(this->Statement);
if (status != SQL_SUCCESS && status != SQL_SUCCESS_WITH_INFO)
{
- vtksys_ios::ostringstream errorBuf;
+ std::ostringstream errorBuf;
errorBuf << "vtkODBCQuery: Unable to close SQL cursor. Error: "
<< GetErrorMessage(SQL_HANDLE_STMT, this->Statement);
cerr << errorBuf.str() << "\n";
@@ -180,7 +180,7 @@ vtkODBCQueryInternals::FreeStatement()
status = SQLFreeHandle(SQL_HANDLE_STMT, this->Statement);
if (status != SQL_SUCCESS && status != SQL_SUCCESS_WITH_INFO)
{
- vtksys_ios::ostringstream errorBuf;
+ std::ostringstream errorBuf;
errorBuf << "Unable to free statement handle. Memory leak will occur. Error: "
<< GetErrorMessage(SQL_HANDLE_STMT, this->Statement);
cerr << errorBuf.str() << "\n";
@@ -321,7 +321,7 @@ bool vtkODBCQueryInternals::PrepareQuery(const char *queryString,
&(this->Statement));
if (status != SQL_SUCCESS && status != SQL_SUCCESS_WITH_INFO)
{
- vtksys_ios::ostringstream errorBuf;
+ std::ostringstream errorBuf;
errorBuf << "Unable to allocate new statement handle. Error: "
<< GetErrorMessage(SQL_HANDLE_DBC, dbConnection);
error_message = errorBuf.str();
@@ -349,7 +349,7 @@ bool vtkODBCQueryInternals::PrepareQuery(const char *queryString,
if (status != SQL_SUCCESS)
{
- vtksys_ios::ostringstream errorBuf;
+ std::ostringstream errorBuf;
errorBuf << "Unable to prepare query for execution: "
<< GetErrorMessage(SQL_HANDLE_STMT, this->Statement);
error_message = errorBuf.str();
@@ -468,7 +468,7 @@ GetErrorMessage(SQLSMALLINT handleType, SQLHANDLE handle, int *code)
// There may be several error messages queued up so we need to loop
// until we've got everything.
- vtksys_ios::ostringstream messagebuf;
+ std::ostringstream messagebuf;
do
{
status = SQLGetDiagRec(handleType, handle,
@@ -585,7 +585,7 @@ vtkODBCQuery::Execute()
if (status != SQL_SUCCESS && status != SQL_SUCCESS_WITH_INFO)
{
- vtksys_ios::ostringstream errorBuf;
+ std::ostringstream errorBuf;
errorBuf << "Unable to execute statement: "
<< GetErrorMessage(SQL_HANDLE_STMT, this->Internals->Statement);
@@ -641,7 +641,7 @@ vtkODBCQuery::Execute()
if (status != SQL_SUCCESS && status != SQL_SUCCESS_WITH_INFO)
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "During vtkODBCQuery::Execute while looking up column "
<< i << ": "
<< GetErrorMessage(SQL_HANDLE_STMT, this->Internals->Statement);
@@ -659,7 +659,7 @@ vtkODBCQuery::Execute()
if (status != SQL_SUCCESS && status != SQL_SUCCESS_WITH_INFO)
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "vtkODBCQuery::Execute: Unable to get unsigned flag for column "
<< i << ": "
<< GetErrorMessage(SQL_HANDLE_STMT,
@@ -696,7 +696,7 @@ vtkODBCQuery::GetNumberOfFields()
if (status != SQL_SUCCESS &&
status != SQL_SUCCESS_WITH_INFO)
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "During vtkODBCQuery::GetNumberOfFields: "
<< GetErrorMessage(SQL_HANDLE_STMT, this->Internals->Statement);
this->SetLastErrorText(errbuf.str().c_str());
@@ -1187,7 +1187,7 @@ vtkODBCQuery::CacheIntColumn(int column)
}
else
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "CacheIntColumn (column "
<< column << "): ODBC error: "
<< GetErrorMessage(SQL_HANDLE_STMT,
@@ -1250,7 +1250,7 @@ vtkODBCQuery::CacheLongLongColumn(int column)
}
else
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "CacheLongLongColumn (column "
<< column << "): ODBC error: "
<< GetErrorMessage(SQL_HANDLE_STMT,
@@ -1302,7 +1302,7 @@ vtkODBCQuery::CacheCharColumn(int column)
}
else
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "CacheCharColumn (column "
<< column << "): ODBC error: "
<< GetErrorMessage(SQL_HANDLE_STMT,
@@ -1345,7 +1345,7 @@ vtkODBCQuery::CacheBooleanColumn(int column)
}
else
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "CacheCharColumn (column "
<< column << "): ODBC error: "
<< GetErrorMessage(SQL_HANDLE_STMT,
@@ -1390,7 +1390,7 @@ vtkODBCQuery::CacheFloatColumn(int column)
}
else
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "CacheFloatColumn (column "
<< column << "): ODBC error: "
<< GetErrorMessage(SQL_HANDLE_STMT,
@@ -1432,7 +1432,7 @@ vtkODBCQuery::CacheDoubleColumn(int column)
}
else
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "CacheDoubleColumn (column "
<< column << "): ODBC error: "
<< GetErrorMessage(SQL_HANDLE_STMT,
@@ -1453,7 +1453,7 @@ vtkODBCQuery::CacheStringColumn(int column)
SQLLEN bufferLength;
SQLLEN indicator;
vtkStdString result;
- vtksys_ios::ostringstream outbuf;
+ std::ostringstream outbuf;
bufferLength = 65536; // this is a pretty reasonable compromise
// between the expense of ODBC requests and
@@ -1517,7 +1517,7 @@ vtkODBCQuery::CacheStringColumn(int column)
else if (status == SQL_ERROR)
{
// there was some sort of error
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "Error while reading wide string column " << column << ": "
<< GetErrorMessage(SQL_HANDLE_STMT, this->Internals->Statement);
this->SetLastErrorText(errbuf.str().c_str());
@@ -1570,7 +1570,7 @@ vtkODBCQuery::CacheBinaryColumn(int column)
if (status != SQL_SUCCESS)
{
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "CacheBinaryColumn: Unable to describe column "
<< column << ": "
<< GetErrorMessage(SQL_HANDLE_STMT, this->Internals->Statement);
@@ -1593,8 +1593,8 @@ vtkODBCQuery::CacheBinaryColumn(int column)
this->SetLastErrorText(NULL);
- vtksys_ios::ostringstream resultbuf;
- vtksys_ios::ostringstream outbuf;
+ std::ostringstream resultbuf;
+ std::ostringstream outbuf;
while (true)
{
@@ -1653,7 +1653,7 @@ vtkODBCQuery::CacheBinaryColumn(int column)
else if (status == SQL_ERROR)
{
// there was some sort of error
- vtksys_ios::ostringstream errbuf;
+ std::ostringstream errbuf;
errbuf << "Error while reading binary column " << column << ": "
<< GetErrorMessage(SQL_HANDLE_STMT, this->Internals->Statement);
this->SetLastErrorText(errbuf.str().c_str());
@@ -1885,6 +1885,3 @@ vtkODBCQuery::ClearParameterBindings()
this->Internals->ClearBoundParameters();
return true;
}
-
-
-
diff --git a/IO/ParallelXML/vtkXMLPDataWriter.cxx b/IO/ParallelXML/vtkXMLPDataWriter.cxx
index b873396990f9f2c7a14d26d7c5d692492de50137..ec63372af67f5441540943dba1d27734425e8f35 100644
--- a/IO/ParallelXML/vtkXMLPDataWriter.cxx
+++ b/IO/ParallelXML/vtkXMLPDataWriter.cxx
@@ -278,7 +278,7 @@ void vtkXMLPDataWriter::SplitFileName()
//----------------------------------------------------------------------------
char* vtkXMLPDataWriter::CreatePieceFileName(int index, const char* path)
{
- vtksys_ios::ostringstream s;
+ std::ostringstream s;
if (path)
{
s << path;
diff --git a/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.cxx b/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.cxx
index 044801348326a07cbf889924c4e5fa9b8e0d2282..65286c7d1fa85beeca384e237a025d5f14a61d87 100644
--- a/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.cxx
+++ b/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.cxx
@@ -371,7 +371,7 @@ vtkStdString vtkXMLPMultiBlockDataWriter::CreatePieceFileName(
}
}
- vtksys_ios::ostringstream fn_with_warning_C4701;
+ std::ostringstream fn_with_warning_C4701;
fn_with_warning_C4701
<< this->GetFilePrefix() << "/"
<< this->GetFilePrefix() << "_" << currentFileIndex
diff --git a/IO/PostgreSQL/vtkPostgreSQLDatabase.cxx b/IO/PostgreSQL/vtkPostgreSQLDatabase.cxx
index d188431194953ac61d947e5744f4783f1c036b0b..3317d29f48a9445f9dd2ab244980f014140bb35f 100644
--- a/IO/PostgreSQL/vtkPostgreSQLDatabase.cxx
+++ b/IO/PostgreSQL/vtkPostgreSQLDatabase.cxx
@@ -102,7 +102,7 @@ void vtkPostgreSQLDatabase::PrintSelf(ostream &os, vtkIndent indent)
vtkStdString vtkPostgreSQLDatabase::GetColumnSpecification(
vtkSQLDatabaseSchema* schema, int tblHandle, int colHandle )
{
- vtksys_ios::ostringstream queryStr;
+ std::ostringstream queryStr;
queryStr << schema->GetColumnNameFromHandle( tblHandle, colHandle );
// Figure out column type
@@ -255,7 +255,7 @@ bool vtkPostgreSQLDatabase::Open( const char* password )
if ( this->ServerPort > 0 )
{
options += " port=";
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
stream << this->ServerPort;
options += stream.str();
}
diff --git a/IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h b/IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h
index b9c4bdcea42fb2a3756a3bfa9bcda76615da5e37..a386e01a0b839b7d52c9b0e0f68ec49ea825bf40 100644
--- a/IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h
+++ b/IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; -*- */
/*=========================================================================
Program: Visualization Toolkit
@@ -39,7 +38,7 @@
#include "vtkTimeStamp.h"
#include <libpq-fe.h>
-#include <vtksys/stl/map>
+#include <map>
class vtkPostgreSQLDatabasePrivate
{
@@ -62,7 +61,7 @@ class vtkPostgreSQLDatabasePrivate
// Given a Postgres column type OID, return a VTK array type (see vtkType.h).
int GetVTKTypeFromOID( Oid pgtype )
{
- vtksys_stl::map<Oid,int>::const_iterator it = this->DataTypeMap.find( pgtype );
+ std::map<Oid,int>::const_iterator it = this->DataTypeMap.find( pgtype );
if ( it == this->DataTypeMap.end() )
{
return VTK_STRING;
@@ -78,7 +77,7 @@ class vtkPostgreSQLDatabasePrivate
PGconn *Connection;
// Map Postgres column types to VTK types.
- vtksys_stl::map<Oid,int> DataTypeMap;
+ std::map<Oid,int> DataTypeMap;
};
#endif // vtkPostgreSQLDatabasePrivate_h
diff --git a/IO/PostgreSQL/vtkPostgreSQLQuery.cxx b/IO/PostgreSQL/vtkPostgreSQLQuery.cxx
index b6cb69c94180e3af4eb32151bc6965dae38dac20..82e18fe81395a6dcdc9d427cf7abbd4c800a491b 100644
--- a/IO/PostgreSQL/vtkPostgreSQLQuery.cxx
+++ b/IO/PostgreSQL/vtkPostgreSQLQuery.cxx
@@ -315,7 +315,7 @@ bool vtkPostgreSQLQuery::Execute()
{
returnStatus = false;
this->Active = false;
- vtksys_ios::ostringstream sbuf;
+ std::ostringstream sbuf;
sbuf << "Unhandled server response: ";
sbuf << PQresStatus(PQresultStatus(this->QueryInternals->QueryResults));
this->SetLastErrorText(sbuf.str().c_str());
@@ -912,7 +912,7 @@ vtkVariant ConvertStringToVtkIdType(bool isBinary, const char *rawData)
}
else
{
- vtksys_ios::stringstream convertStream;
+ std::stringstream convertStream;
convertStream.str(rawData);
vtkIdType result;
convertStream >> result;
diff --git a/IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx b/IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx
index c6b61b8c928466ef0506675d7ddbcf0686a1b135..1043562f4c6fbf5f1e99c3c9a4fedcf26eb09c85 100644
--- a/IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx
+++ b/IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx
@@ -55,7 +55,7 @@ int TestSQLGraphReader(int argc, char* argv[])
// Build a graph
vtkSmartPointer<vtkSQLQuery> q;
q.TakeReference(database->GetQueryInstance());
- vtksys_ios::ostringstream oss;
+ std::ostringstream oss;
q->SetQuery("DROP TABLE IF EXISTS vertices");
q->Execute();
diff --git a/IO/SQL/vtkRowQueryToTable.cxx b/IO/SQL/vtkRowQueryToTable.cxx
index 9074e1ddb70f37cab4d1e1b978aec0694945d4e3..87e7190d8d0ff27de920091e5f98515461e4f8ef 100644
--- a/IO/SQL/vtkRowQueryToTable.cxx
+++ b/IO/SQL/vtkRowQueryToTable.cxx
@@ -119,7 +119,7 @@ int vtkRowQueryToTable::RequestData(
if (output->GetColumnByName(name))
{
int i = 1;
- vtksys_ios::ostringstream oss;
+ std::ostringstream oss;
vtkStdString newName;
do
{
diff --git a/IO/SQL/vtkSQLDatabase.cxx b/IO/SQL/vtkSQLDatabase.cxx
index db2d6499971227679870629145d34bdddc1cf98e..c84dcc5cee21d781a71e2501e90e70ad2a025fac 100644
--- a/IO/SQL/vtkSQLDatabase.cxx
+++ b/IO/SQL/vtkSQLDatabase.cxx
@@ -132,7 +132,7 @@ vtkStdString vtkSQLDatabase::GetColumnSpecification( vtkSQLDatabaseSchema* schem
int tblHandle,
int colHandle )
{
- vtksys_ios::ostringstream queryStr;
+ std::ostringstream queryStr;
queryStr << schema->GetColumnNameFromHandle( tblHandle, colHandle );
// Figure out column type
diff --git a/IO/SQL/vtkSQLiteDatabase.cxx b/IO/SQL/vtkSQLiteDatabase.cxx
index 473c6e7366f7a5eabbffaa04140606b6e11a6628..b71adbaeba15e47ee5153d76ad5ac3340bee278b 100644
--- a/IO/SQL/vtkSQLiteDatabase.cxx
+++ b/IO/SQL/vtkSQLiteDatabase.cxx
@@ -90,7 +90,7 @@ vtkStdString vtkSQLiteDatabase::GetColumnSpecification( vtkSQLDatabaseSchema* sc
int tblHandle,
int colHandle )
{
- vtksys_ios::ostringstream queryStr;
+ std::ostringstream queryStr;
queryStr << schema->GetColumnNameFromHandle( tblHandle, colHandle );
// Figure out column type
@@ -296,7 +296,7 @@ bool vtkSQLiteDatabase::Open(const char* password, int mode)
if (mode == CREATE_OR_CLEAR && exists)
{
// Here we need to clear the file if it exists by opening it.
- vtksys_ios::ofstream os;
+ std::ofstream os;
os.open(this->DatabaseFileName);
if (!os.is_open())
{
diff --git a/IO/SQL/vtkSQLiteQuery.cxx b/IO/SQL/vtkSQLiteQuery.cxx
index 4b22c4aac9f9f5df1ab6838cf8806adac12556cf..f6981c9abf89c1a94271d4a7102d40f9fcd2ad7e 100644
--- a/IO/SQL/vtkSQLiteQuery.cxx
+++ b/IO/SQL/vtkSQLiteQuery.cxx
@@ -373,7 +373,7 @@ vtkVariant vtkSQLiteQuery::DataValue(vtkIdType column)
case VTK_SQLITE_TEXT:
{
- vtksys_ios::ostringstream str;
+ std::ostringstream str;
str << vtk_sqlite3_column_text(this->Statement, column);
return vtkVariant(vtkStdString(str.str()));
}
@@ -650,7 +650,7 @@ bool vtkSQLiteQuery::BindIntegerParameter(int index, int value)
if (status != VTK_SQLITE_OK)
{
- vtksys_ios::ostringstream errormessage;
+ std::ostringstream errormessage;
errormessage << "sqlite_bind_int returned error: " << status;
this->SetLastErrorText(errormessage.str().c_str());
vtkErrorMacro(<<errormessage.str().c_str());
@@ -679,7 +679,7 @@ bool vtkSQLiteQuery::BindInt64Parameter(int index, vtkTypeInt64 value)
if (status != VTK_SQLITE_OK)
{
- vtksys_ios::ostringstream errormessage;
+ std::ostringstream errormessage;
errormessage << "sqlite_bind_int64 returned error: " << status;
this->SetLastErrorText(errormessage.str().c_str());
vtkErrorMacro(<<this->GetLastErrorText());
@@ -709,7 +709,7 @@ bool vtkSQLiteQuery::BindDoubleParameter(int index, double value)
if (status != VTK_SQLITE_OK)
{
- vtksys_ios::ostringstream errormessage;
+ std::ostringstream errormessage;
errormessage << "sqlite_bind_double returned error: " << status;
this->SetLastErrorText(errormessage.str().c_str());
vtkErrorMacro(<<this->GetLastErrorText());
@@ -738,7 +738,7 @@ bool vtkSQLiteQuery::BindStringParameter(int index, const char *value, int lengt
if (status != VTK_SQLITE_OK)
{
- vtksys_ios::ostringstream errormessage;
+ std::ostringstream errormessage;
errormessage << "sqlite_bind_text returned error: " << status;
this->SetLastErrorText(errormessage.str().c_str());
vtkErrorMacro(<<this->GetLastErrorText());
@@ -772,7 +772,7 @@ bool vtkSQLiteQuery::BindBlobParameter(int index, const void *data, int length)
if (status != VTK_SQLITE_OK)
{
- vtksys_ios::ostringstream errormessage;
+ std::ostringstream errormessage;
errormessage << "sqlite_bind_blob returned error: " << status;
this->SetLastErrorText(errormessage.str().c_str());
vtkErrorMacro(<<this->GetLastErrorText());
@@ -801,7 +801,7 @@ bool vtkSQLiteQuery::ClearParameterBindings()
if (status != VTK_SQLITE_OK)
{
- vtksys_ios::ostringstream errormessage;
+ std::ostringstream errormessage;
errormessage << "sqlite_clear_bindings returned error: " << status;
this->SetLastErrorText(errormessage.str().c_str());
vtkErrorMacro(<<this->GetLastErrorText());
diff --git a/IO/XML/vtkXMLCompositeDataWriter.cxx b/IO/XML/vtkXMLCompositeDataWriter.cxx
index 8d857072151bbceeadeb133d06c7d072fc4e4652..41196856e09d12a0b8a369b736e2e9bbde962b2a 100644
--- a/IO/XML/vtkXMLCompositeDataWriter.cxx
+++ b/IO/XML/vtkXMLCompositeDataWriter.cxx
@@ -586,7 +586,7 @@ vtkStdString vtkXMLCompositeDataWriter::CreatePieceFileName(
return "";
}
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
stream << this->Internal->FilePrefix.c_str() << "/"
<< this->Internal->FilePrefix.c_str()
<< "_" << piece << ".";
diff --git a/IO/XML/vtkXMLPDataReader.cxx b/IO/XML/vtkXMLPDataReader.cxx
index fe83ebcf2d10e413bdb0220163f7daa4b37db59a..e38bdb67edb5fab85ed8fe2f2a02705aed800961 100644
--- a/IO/XML/vtkXMLPDataReader.cxx
+++ b/IO/XML/vtkXMLPDataReader.cxx
@@ -433,7 +433,7 @@ int vtkXMLPDataReader::CanReadPiece(int index)
//----------------------------------------------------------------------------
char* vtkXMLPDataReader::CreatePieceFileName(const char* fileName)
{
- vtksys_ios::ostringstream fn_with_warning_C4701;
+ std::ostringstream fn_with_warning_C4701;
// only prepend the path if the given file name is not
// absolute (i.e. doesn't start with '/')
diff --git a/IO/XML/vtkXMLPStructuredDataReader.cxx b/IO/XML/vtkXMLPStructuredDataReader.cxx
index c1cfb4a1939530e2f3285013678e727c6396cd08..e73ae8ba01dac3e4c21c817ca98e698936aafb57 100644
--- a/IO/XML/vtkXMLPStructuredDataReader.cxx
+++ b/IO/XML/vtkXMLPStructuredDataReader.cxx
@@ -441,7 +441,7 @@ int vtkXMLPStructuredDataReader::ComputePieceSubExtents()
if(!this->ExtentSplitter->ComputeSubExtents())
{
// A portion of the extent is not available.
- vtksys_ios::ostringstream e_with_warning_C4701;
+ std::ostringstream e_with_warning_C4701;
e_with_warning_C4701
<< "No available piece provides data for the following extents:\n";
for(i=0; i < this->ExtentSplitter->GetNumberOfSubExtents(); ++i)
diff --git a/IO/XML/vtkXMLReader.cxx b/IO/XML/vtkXMLReader.cxx
index 969a294c3eb43ccdcd45403082950bbbb3c8dead..98927a4677e29f9d7fbe7099caea152508c2f9a7 100644
--- a/IO/XML/vtkXMLReader.cxx
+++ b/IO/XML/vtkXMLReader.cxx
@@ -60,7 +60,7 @@ static void ReadStringVersion(const char* version, int& major, int& minor)
if (s > begin)
{
- vtksys_ios::stringstream str;
+ std::stringstream str;
str.write(begin, s-begin);
str >> major;
if (!str)
@@ -70,7 +70,7 @@ static void ReadStringVersion(const char* version, int& major, int& minor)
}
if (++s < end)
{
- vtksys_ios::stringstream str;
+ std::stringstream str;
str.write(s, end-s);
str >> minor;
if (!str)
@@ -786,7 +786,7 @@ vtkAbstractArray* vtkXMLReader::CreateArray(vtkXMLDataElement* da)
//determine what component names have been saved in the file.
const char* compName = 0;
- vtksys_ios::ostringstream buff;
+ std::ostringstream buff;
for (int i = 0; i < components && i < 10; ++i)
{
//get the component names
@@ -1024,7 +1024,7 @@ void vtkXMLReader::SetDataArraySelections(
}
else
{
- vtksys_ios::ostringstream s;
+ std::ostringstream s;
s << "Array " << i;
sel->AddArray(s.str().c_str());
}
diff --git a/IO/XML/vtkXMLWriter.cxx b/IO/XML/vtkXMLWriter.cxx
index 055a6433541ea55b1e1d886bada1830a7e5836cb..b433327c1e37abe7aa7e75ffdffdd1e32000eca8 100644
--- a/IO/XML/vtkXMLWriter.cxx
+++ b/IO/XML/vtkXMLWriter.cxx
@@ -751,7 +751,7 @@ int vtkXMLWriter::OpenFile()
int vtkXMLWriter::OpenString()
{
delete this->OutStringStream;
- this->OutStringStream = new vtksys_ios::ostringstream();
+ this->OutStringStream = new std::ostringstream();
this->Stream = this->OutStringStream;
return 1;
@@ -1997,7 +1997,7 @@ void vtkXMLWriter::WriteArrayHeader(vtkAbstractArray* a, vtkIndent indent,
else
{
// Generate a name for this array.
- vtksys_ios::ostringstream name;
+ std::ostringstream name;
void* p = a;
name << "Array " << p;
this->WriteStringAttribute("Name", name.str().c_str());
@@ -2009,7 +2009,7 @@ void vtkXMLWriter::WriteArrayHeader(vtkAbstractArray* a, vtkIndent indent,
}
//always write out component names, even if only 1 component
- vtksys_ios::ostringstream buff;
+ std::ostringstream buff;
const char* compName = NULL;
for (int i = 0; i < a->GetNumberOfComponents(); ++i)
{
diff --git a/IO/XML/vtkXMLWriter.h b/IO/XML/vtkXMLWriter.h
index f08c6c1faba000b86f4fd3bc346636d165725d27..df7eafcae99ef2c3f3e68666c1a555ef2767a7ac 100644
--- a/IO/XML/vtkXMLWriter.h
+++ b/IO/XML/vtkXMLWriter.h
@@ -440,7 +440,7 @@ protected:
float ProgressRange[2];
ofstream* OutFile;
- vtksys_ios::ostringstream* OutStringStream;
+ std::ostringstream* OutStringStream;
int OpenStream();
int OpenFile();
diff --git a/IO/XMLParser/vtkXMLUtilities.cxx b/IO/XMLParser/vtkXMLUtilities.cxx
index 0d974ca69db0df07af4e58f4748d87ef4a1fa836..dfcf523dd8d24d95d41d37b21906c7c603e5e085 100644
--- a/IO/XMLParser/vtkXMLUtilities.cxx
+++ b/IO/XMLParser/vtkXMLUtilities.cxx
@@ -419,7 +419,7 @@ vtkXMLUtilities::ReadElementFromString(const char *str, int encoding)
return 0;
}
- vtksys_ios::stringstream strstr;
+ std::stringstream strstr;
strstr << str;
vtkXMLDataElement *res =
vtkXMLUtilities::ReadElementFromStream(strstr, encoding);
@@ -468,7 +468,7 @@ void vtkXMLUtilities::ReadElementFromAttributeArray(
}
else
{
- vtksys_ios::ostringstream str;
+ std::ostringstream str;
vtkXMLUtilities::EncodeString(
atts[i+1], VTK_ENCODING_UTF_8, str, element->GetAttributeEncoding(), 0);
str << ends;
@@ -623,7 +623,7 @@ int vtkXMLUtilities::FactorElementsInternal(vtkXMLDataElement *tree,
char buffer[5];
sprintf(buffer, "%02d_", pool->GetNumberOfNestedElements());
- vtksys_ios::ostringstream id;
+ std::ostringstream id;
id << buffer << tree->GetName();
vtkXMLDataElement *factored = vtkXMLDataElement::New();
diff --git a/IO/Xdmf2/vtkXdmfReaderInternal.cxx b/IO/Xdmf2/vtkXdmfReaderInternal.cxx
index ae7d61e05c982370df7b6d025df3aa1bc2618dcb..447b75f39d48bd8dd8ac1180d6b7b14f05060b44 100644
--- a/IO/Xdmf2/vtkXdmfReaderInternal.cxx
+++ b/IO/Xdmf2/vtkXdmfReaderInternal.cxx
@@ -144,7 +144,7 @@ void vtkXdmfDocument::UpdateDomains()
}
else
{
- vtksys_ios::ostringstream str;
+ std::ostringstream str;
str << "Domain" << this->Domains.size() << ends;
this->Domains.push_back(str.str());
}
@@ -567,7 +567,7 @@ void vtkXdmfDomain::CollectMetaData()
unsigned int count=1;
while (this->Grids->HasArray(gridName.c_str()))
{
- vtksys_ios::ostringstream str;
+ std::ostringstream str;
str << xmfGrid->GetName() << "[" << count << "]";
gridName = str.str();
count++;
@@ -669,7 +669,7 @@ void vtkXdmfDomain::CollectLeafMetaData(XdmfGrid* xmfGrid, vtkIdType silParent)
unsigned int count=1;
while (this->Grids->HasArray(gridName.c_str()))
{
- vtksys_ios::ostringstream str;
+ std::ostringstream str;
str << xmfGrid->GetName() << "[" << count << "]";
gridName = str.str();
count++;
diff --git a/IO/Xdmf3/vtkXdmf3LightDataHandler.cxx b/IO/Xdmf3/vtkXdmf3LightDataHandler.cxx
index 603269f9311d537da514eef252b2a2a6ee3d3a5b..bec24588924b05dc6a3e8461633d31aaffd2e0cb 100644
--- a/IO/Xdmf3/vtkXdmf3LightDataHandler.cxx
+++ b/IO/Xdmf3/vtkXdmf3LightDataHandler.cxx
@@ -341,7 +341,7 @@ std::string vtkXdmf3LightDataHandler::UniqueName(std::string name, bool ForGrid)
vtkXdmf3ArraySelection* cache = (ForGrid?this->GridsCache:this->SetsCache);
while (cache->HasArray(gridName.c_str()))
{
- vtksys_ios::ostringstream str;
+ std::ostringstream str;
str << name << "[" << count << "]";
gridName = str.str();
count++;
diff --git a/Imaging/General/vtkImageGradient.cxx b/Imaging/General/vtkImageGradient.cxx
index 851a1f7624e873bffb99a5a2eebf8341cb95489e..977af377acf769ad47415160aaaac6362397b32c 100644
--- a/Imaging/General/vtkImageGradient.cxx
+++ b/Imaging/General/vtkImageGradient.cxx
@@ -281,7 +281,7 @@ int vtkImageGradient::RequestData(
}
vtkImageData* output = vtkImageData::GetData(outputVector);
vtkDataArray* outArray = output->GetPointData()->GetScalars();
- vtksys_ios::ostringstream newname;
+ std::ostringstream newname;
newname << (outArray->GetName()?outArray->GetName():"")
<< "Gradient";
outArray->SetName(newname.str().c_str());
diff --git a/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostAdapter.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostAdapter.cxx
index f2f32051a7d6fc11828263af389ad8beb4a25e91..d5f16face907535dab8986e80ef5fd93818f902d 100644
--- a/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostAdapter.cxx
+++ b/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostAdapter.cxx
@@ -26,9 +26,9 @@
#include "vtkSmartPointer.h"
#include "vtkTimerLog.h"
-#include <vtksys/stl/vector>
-#include <vtksys/stl/map>
-#include <vtksys/stl/utility>
+#include <vector>
+
+#include <utility>
// In Boost 1.34.1, boost/pending/relaxed_heap.hpp does not include <climits>
// but uses CHAR_BIT. gcc>=4.3 has stricter and cleaner header files
@@ -49,7 +49,6 @@
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
using namespace boost;
-using namespace vtksys_stl;
template <typename Graph>
void TestTraversal(Graph g, int repeat, int& vtkNotUsed(errors))
@@ -78,8 +77,8 @@ void TestTraversal(Graph g, int repeat, int& vtkNotUsed(errors))
Edge e = *(edges(g).first);
Vertex v = *(vertices(g).first);
- vector<Edge> edge_vec;
- vector<Vertex> vert_vec;
+ std::vector<Edge> edge_vec;
+ std::vector<Vertex> vert_vec;
timer->StartTimer();
count = 0;
@@ -177,8 +176,8 @@ void TestGraph(Graph g, vtkIdType numVertices, vtkIdType numEdges, int repeat, i
VTK_CREATE(vtkTimerLog, timer);
- vector<Vertex> graphVerts;
- vector<Edge> graphEdges;
+ std::vector<Vertex> graphVerts;
+ std::vector<Edge> graphEdges;
typename graph_traits<Graph>::vertex_iterator vi, viEnd;
// Create a graph
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.cxx
index faacc68619b78fb3a02047a5e3ac8f33c9b941d8..fdbbcf036f3192033567742cbe3f49d40bf26ec7 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.cxx
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.cxx
@@ -33,12 +33,10 @@
#include "vtkBoostGraphAdapter.h"
#include <boost/graph/biconnected_components.hpp>
#include <boost/version.hpp>
-#include <vtksys/stl/vector>
-#include <vtksys/stl/utility>
+#include <vector>
+#include <utility>
using namespace boost;
-using vtksys_stl::vector;
-using vtksys_stl::pair;
vtkStandardNewMacro(vtkBoostBiconnectedComponents);
@@ -91,9 +89,9 @@ int vtkBoostBiconnectedComponents::RequestData(
// Create vector of articulation points and set it up for insertion
// by the algorithm.
- vector<vtkIdType> artPoints;
- pair<size_t, vtksys_stl::back_insert_iterator<vector<vtkIdType> > >
- res(0, vtksys_stl::back_inserter(artPoints));
+ std::vector<vtkIdType> artPoints;
+ std::pair<size_t, std::back_insert_iterator<std::vector<vtkIdType> > >
+ res(0, std::back_inserter(artPoints));
// Call BGL biconnected_components.
// It appears that the signature for this
@@ -101,13 +99,13 @@ int vtkBoostBiconnectedComponents::RequestData(
#if BOOST_VERSION < 103300 // Boost 1.32.x
// TODO I have no idea what the 1.32 signature is suppose to be
// res = biconnected_components(
- // output, helper, vtksys_stl::back_inserter(artPoints), vtkGraphIndexMap());
+ // output, helper, std::back_inserter(artPoints), vtkGraphIndexMap());
#elif BOOST_VERSION < 103400 // Boost 1.33.x
res = biconnected_components(
- output, helper, vtksys_stl::back_inserter(artPoints), vtkGraphIndexMap());
+ output, helper, std::back_inserter(artPoints), vtkGraphIndexMap());
#else // Anything after Boost 1.34.x
res = biconnected_components(
- output, helper, vtksys_stl::back_inserter(artPoints), vertex_index_map(vtkGraphIndexMap()));
+ output, helper, std::back_inserter(artPoints), vertex_index_map(vtkGraphIndexMap()));
#endif
size_t numComp = res.first;
@@ -149,7 +147,7 @@ int vtkBoostBiconnectedComponents::RequestData(
// Articulation points belong to multiple biconnected components.
// Indicate these by assigning a component value of -1.
// It belongs to whatever components its incident edges belong to.
- vector<vtkIdType>::size_type i;
+ std::vector<vtkIdType>::size_type i;
for (i = 0; i < artPoints.size(); i++)
{
vertCompArr->SetValue(artPoints[i], -1);
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostGraphAdapter.h b/Infovis/BoostGraphAlgorithms/vtkBoostGraphAdapter.h
index 3aedb8441d16d74e57293db8124392a41488c4c3..157bb984a26e84fa9e83c2590eea1ed149fa3112 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostGraphAdapter.h
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostGraphAdapter.h
@@ -139,7 +139,7 @@ namespace boost {
#endif
}
-#include <vtksys/stl/utility> // STL Header
+#include <utility> // STL Header
#include <boost/config.hpp>
#include <boost/iterator/iterator_facade.hpp>
@@ -830,7 +830,7 @@ target(boost::graph_traits< vtkGraph* >::edge_descriptor e,
return e.Target;
}
-inline vtksys_stl::pair<
+inline std::pair<
boost::graph_traits< vtkGraph* >::vertex_iterator,
boost::graph_traits< vtkGraph* >::vertex_iterator >
vertices(vtkGraph *g)
@@ -844,20 +844,20 @@ vertices(vtkGraph *g)
start = helper->MakeDistributedId(rank, start);
}
- return vtksys_stl::make_pair( Iter(start),
+ return std::make_pair( Iter(start),
Iter(start + g->GetNumberOfVertices()) );
}
-inline vtksys_stl::pair<
+inline std::pair<
boost::graph_traits< vtkGraph* >::edge_iterator,
boost::graph_traits< vtkGraph* >::edge_iterator >
edges(vtkGraph *g)
{
typedef boost::graph_traits< vtkGraph* >::edge_iterator Iter;
- return vtksys_stl::make_pair( Iter(g), Iter(g, g->GetNumberOfVertices()) );
+ return std::make_pair( Iter(g), Iter(g, g->GetNumberOfVertices()) );
}
-inline vtksys_stl::pair<
+inline std::pair<
boost::graph_traits< vtkGraph* >::out_edge_iterator,
boost::graph_traits< vtkGraph* >::out_edge_iterator >
out_edges(
@@ -865,11 +865,11 @@ out_edges(
vtkGraph *g)
{
typedef boost::graph_traits< vtkGraph* >::out_edge_iterator Iter;
- vtksys_stl::pair<Iter, Iter> p = vtksys_stl::make_pair( Iter(g, u), Iter(g, u, true) );
+ std::pair<Iter, Iter> p = std::make_pair( Iter(g, u), Iter(g, u, true) );
return p;
}
-inline vtksys_stl::pair<
+inline std::pair<
boost::graph_traits< vtkGraph* >::in_edge_iterator,
boost::graph_traits< vtkGraph* >::in_edge_iterator >
in_edges(
@@ -877,11 +877,11 @@ in_edges(
vtkGraph *g)
{
typedef boost::graph_traits< vtkGraph* >::in_edge_iterator Iter;
- vtksys_stl::pair<Iter, Iter> p = vtksys_stl::make_pair( Iter(g, u), Iter(g, u, true) );
+ std::pair<Iter, Iter> p = std::make_pair( Iter(g, u), Iter(g, u, true) );
return p;
}
-inline vtksys_stl::pair<
+inline std::pair<
boost::graph_traits< vtkGraph* >::adjacency_iterator,
boost::graph_traits< vtkGraph* >::adjacency_iterator >
adjacent_vertices(
@@ -890,8 +890,8 @@ adjacent_vertices(
{
typedef boost::graph_traits< vtkGraph* >::adjacency_iterator Iter;
typedef boost::graph_traits< vtkGraph* >::out_edge_iterator OutEdgeIter;
- vtksys_stl::pair<OutEdgeIter, OutEdgeIter> out = out_edges(u, g);
- return vtksys_stl::make_pair( Iter(out.first, &g), Iter(out.second, &g) );
+ std::pair<OutEdgeIter, OutEdgeIter> out = out_edges(u, g);
+ return std::make_pair( Iter(out.first, &g), Iter(out.second, &g) );
}
inline boost::graph_traits< vtkGraph* >::vertices_size_type
@@ -936,7 +936,7 @@ add_vertex(vtkMutableDirectedGraph *g)
return g->AddVertex();
}
-inline vtksys_stl::pair<
+inline std::pair<
boost::graph_traits< vtkMutableDirectedGraph* >::edge_descriptor,
bool>
add_edge(
@@ -945,7 +945,7 @@ add_edge(
vtkMutableDirectedGraph *g)
{
boost::graph_traits< vtkMutableDirectedGraph* >::edge_descriptor e = g->AddEdge(u, v);
- return vtksys_stl::make_pair(e, true);
+ return std::make_pair(e, true);
}
inline boost::graph_traits< vtkMutableUndirectedGraph* >::vertex_descriptor
@@ -954,7 +954,7 @@ add_vertex(vtkMutableUndirectedGraph *g)
return g->AddVertex();
}
-inline vtksys_stl::pair<
+inline std::pair<
boost::graph_traits< vtkMutableUndirectedGraph* >::edge_descriptor,
bool>
add_edge(
@@ -963,7 +963,7 @@ add_edge(
vtkMutableUndirectedGraph *g)
{
boost::graph_traits< vtkMutableUndirectedGraph* >::edge_descriptor e = g->AddEdge(u, v);
- return vtksys_stl::make_pair(e, true);
+ return std::make_pair(e, true);
}
namespace boost {
diff --git a/Infovis/Core/vtkExpandSelectedGraph.cxx b/Infovis/Core/vtkExpandSelectedGraph.cxx
index 350ce3a468b57f8bc22450029922c22d965abdbe..803d3b9cf11d3edf0fbf31b38403ce27bab4d5ea 100644
--- a/Infovis/Core/vtkExpandSelectedGraph.cxx
+++ b/Infovis/Core/vtkExpandSelectedGraph.cxx
@@ -39,7 +39,7 @@
#include "vtkSmartPointer.h"
#include "vtkStringArray.h"
-#include <vtksys/stl/set>
+#include <set>
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
@@ -99,7 +99,7 @@ int vtkExpandSelectedGraph::RequestData(
// to a single index selection which we then expand, instead of
// expanding each child selection and merging them which creates
// duplicates.
- vtksys_stl::set<vtkIdType> indexSet;
+ std::set<vtkIdType> indexSet;
for(int i=0; i<indexArray->GetNumberOfTuples(); ++i)
{
indexSet.insert(indexArray->GetValue(i));
@@ -107,7 +107,7 @@ int vtkExpandSelectedGraph::RequestData(
// Delete any entries in the current selection list
indexArray->Reset();
// Convert the stl set into the selection list
- vtksys_stl::set<vtkIdType>::iterator I;
+ std::set<vtkIdType>::iterator I;
for(I = indexSet.begin(); I != indexSet.end(); ++I)
{
indexArray->InsertNextValue(*I);
@@ -147,7 +147,7 @@ void vtkExpandSelectedGraph::BFSExpandSelection(vtkIdTypeArray *indexArray,
VTK_CREATE(vtkOutEdgeIterator, outIt);
vtkAbstractArray* domainArr = graph->GetVertexData()->GetAbstractArray("domain");
- vtksys_stl::set<vtkIdType> indexSet;
+ std::set<vtkIdType> indexSet;
for (int i=0; i<indexArray->GetNumberOfTuples(); ++i)
{
// First insert myself
@@ -182,7 +182,7 @@ void vtkExpandSelectedGraph::BFSExpandSelection(vtkIdTypeArray *indexArray,
indexArray->Reset();
// Convert the stl set into the selection list
- vtksys_stl::set<vtkIdType>::iterator I;
+ std::set<vtkIdType>::iterator I;
for(I = indexSet.begin(); I != indexSet.end(); ++I)
{
indexArray->InsertNextValue(*I);
diff --git a/Infovis/Core/vtkExtractSelectedGraph.cxx b/Infovis/Core/vtkExtractSelectedGraph.cxx
index c27d2e39fe64477dffbf9f49b3add3d41ad899a7..1aa08bcac1c11c21e4c394ac8583d6bfa28c97db 100644
--- a/Infovis/Core/vtkExtractSelectedGraph.cxx
+++ b/Infovis/Core/vtkExtractSelectedGraph.cxx
@@ -47,8 +47,7 @@
#include "vtkTree.h"
#include "vtkVertexListIterator.h"
-#include <vtksys/stl/map>
-#include <vector>
+#include <map>
vtkStandardNewMacro(vtkExtractSelectedGraph);
//----------------------------------------------------------------------------
@@ -298,7 +297,7 @@ int vtkExtractSelectedGraph::RequestData(
vtkPoints* ptsOut = builder->GetPoints();
vdOut->CopyAllocate(vdIn);
edOut->CopyAllocate(edIn);
- vtksys_stl::map<vtkIdType, vtkIdType> vertexMap;
+ std::map<vtkIdType, vtkIdType> vertexMap;
// Step 1: Add the vertices.
// If the user has specified a vertex selection, add them.
diff --git a/Infovis/Core/vtkExtractSelectedTree.cxx b/Infovis/Core/vtkExtractSelectedTree.cxx
index 62fa2dccb8db691d4e7bd61d17598e0dcc8fc1d9..2f2de1b17788590a9f38de3c9aaa716dc3bc755e 100644
--- a/Infovis/Core/vtkExtractSelectedTree.cxx
+++ b/Infovis/Core/vtkExtractSelectedTree.cxx
@@ -30,7 +30,7 @@
#include "vtkEdgeListIterator.h"
#include "vtkNew.h"
-#include <vtksys/stl/map>
+#include <map>
vtkStandardNewMacro(vtkExtractSelectedTree);
@@ -88,7 +88,7 @@ int vtkExtractSelectedTree::BuildTree( vtkTree * inputTree, vtkIdTypeArray * sel
//Add selected vertices and set up a map between the input tree vertex id
//and the output tree vertex id
- vtksys_stl::map<vtkIdType, vtkIdType> vertexMap;
+ std::map<vtkIdType, vtkIdType> vertexMap;
for (vtkIdType j = 0; j < selectedVerticesList->GetNumberOfTuples();j++)
{
vtkIdType inVert = selectedVerticesList->GetValue(j);
diff --git a/Infovis/Core/vtkGraphHierarchicalBundleEdges.cxx b/Infovis/Core/vtkGraphHierarchicalBundleEdges.cxx
index 5144b6c09f0496dd85606a9d48690ac21600352a..e642cfd06a4a678525cdea53f2eeffaaf2ee3878 100644
--- a/Infovis/Core/vtkGraphHierarchicalBundleEdges.cxx
+++ b/Infovis/Core/vtkGraphHierarchicalBundleEdges.cxx
@@ -35,8 +35,7 @@
#include "vtkTree.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/map>
-using vtksys_stl::map;
+#include <map>
vtkStandardNewMacro(vtkGraphHierarchicalBundleEdges);
@@ -90,7 +89,7 @@ int vtkGraphHierarchicalBundleEdges::RequestData(
// Create a map from graph indices to tree indices
// If we are using DirectMapping this is trivial
// we just create an identity map
- map<vtkIdType, vtkIdType> graphIndexToTreeIndex;
+ std::map<vtkIdType, vtkIdType> graphIndexToTreeIndex;
if (this->DirectMapping)
{
if (graph->GetNumberOfVertices() > tree->GetNumberOfVertices())
@@ -133,7 +132,7 @@ int vtkGraphHierarchicalBundleEdges::RequestData(
vtkAbstractArray* treeDomainArray =
tree->GetVertexData()->GetAbstractArray("domain");
- map<vtkVariant,vtkIdType,vtkVariantLessThan> graphIdMap;
+ std::map<vtkVariant,vtkIdType,vtkVariantLessThan> graphIdMap;
// Create a map from graph id to graph index
for (int i=0; i<graph->GetNumberOfVertices(); ++i)
diff --git a/Infovis/Core/vtkGroupLeafVertices.cxx b/Infovis/Core/vtkGroupLeafVertices.cxx
index 3d2020ab51a5b2b55bbcd816643f0d18b3e164f9..62ec7af6063532f3e67fae2ebd6f143086105e5b 100644
--- a/Infovis/Core/vtkGroupLeafVertices.cxx
+++ b/Infovis/Core/vtkGroupLeafVertices.cxx
@@ -36,9 +36,9 @@
#include "vtkVariantArray.h"
#include "vtkUnicodeStringArray.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
+#include <map>
+#include <utility>
+#include <vector>
vtkStandardNewMacro(vtkGroupLeafVertices);
@@ -51,8 +51,8 @@ class vtkGroupLeafVerticesCompare
{
public:
bool operator()(
- const vtksys_stl::pair<vtkIdType, vtkVariant>& a,
- const vtksys_stl::pair<vtkIdType, vtkVariant>& b) const
+ const std::pair<vtkIdType, vtkVariant>& a,
+ const std::pair<vtkIdType, vtkVariant>& b) const
{
if (a.first != b.first)
{
@@ -236,10 +236,10 @@ int vtkGroupLeafVertices::RequestData(
// Copy everything into the new tree, adding group nodes.
// Make a map of (parent id, group-by string) -> group vertex id.
- vtksys_stl::map<vtksys_stl::pair<vtkIdType, vtkVariant>,
+ std::map<std::pair<vtkIdType, vtkVariant>,
vtkIdType, vtkGroupLeafVerticesCompare> group_vertices;
- vtksys_stl::vector< vtksys_stl::pair<vtkIdType, vtkIdType> > vertStack;
- vertStack.push_back(vtksys_stl::make_pair(input->GetRoot(), builder->AddVertex()));
+ std::vector< std::pair<vtkIdType, vtkIdType> > vertStack;
+ vertStack.push_back(std::make_pair(input->GetRoot(), builder->AddVertex()));
vtkSmartPointer<vtkOutEdgeIterator> it =
vtkSmartPointer<vtkOutEdgeIterator>::New();
@@ -269,7 +269,7 @@ int vtkGroupLeafVertices::RequestData(
// and recurse.
vtkEdgeType e = builder->AddEdge(v, child);
builderEdgeData->CopyData(inputEdgeData, tree_e.Id, e.Id);
- vertStack.push_back(vtksys_stl::make_pair(tree_child, child));
+ vertStack.push_back(std::make_pair(tree_child, child));
}
else
{
@@ -277,9 +277,9 @@ int vtkGroupLeafVertices::RequestData(
// Look for a group vertex. If there isn't one already, make one.
vtkIdType group_vertex = -1;
vtkVariant groupVal = vtkGroupLeafVerticesGetVariant(arr, tree_child);
- if (group_vertices.count(vtksys_stl::make_pair(v, groupVal)) > 0)
+ if (group_vertices.count(std::make_pair(v, groupVal)) > 0)
{
- group_vertex = group_vertices[vtksys_stl::make_pair(v, groupVal)];
+ group_vertex = group_vertices[std::make_pair(v, groupVal)];
}
else
{
@@ -342,7 +342,7 @@ int vtkGroupLeafVertices::RequestData(
vtkEdgeType group_e = builder->AddEdge(v, group_vertex);
builderEdgeData->CopyData(inputEdgeData, tree_e.Id, group_e.Id);
- group_vertices[vtksys_stl::make_pair(v, groupVal)] = group_vertex;
+ group_vertices[std::make_pair(v, groupVal)] = group_vertex;
if (outputNameArr)
{
@@ -369,7 +369,7 @@ int vtkGroupLeafVertices::RequestData(
}
vtkEdgeType e = builder->AddEdge(group_vertex, child);
builderEdgeData->CopyData(inputEdgeData, tree_e.Id, e.Id);
- vertStack.push_back(vtksys_stl::make_pair(tree_child, child));
+ vertStack.push_back(std::make_pair(tree_child, child));
}
}
}
diff --git a/Infovis/Core/vtkNetworkHierarchy.cxx b/Infovis/Core/vtkNetworkHierarchy.cxx
index 663b4c8be1c4a0628535f7c0b76490a916c0c722..0bfaf4aa2d3835cd6c2680afeff4baed2da8ae75 100644
--- a/Infovis/Core/vtkNetworkHierarchy.cxx
+++ b/Infovis/Core/vtkNetworkHierarchy.cxx
@@ -34,10 +34,10 @@
#include "vtkTree.h"
#include "vtkVariant.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
-#include <vtksys/ios/sstream>
+#include <map>
+#include <utility>
+#include <vector>
+#include <sstream>
#include <algorithm>
vtkStandardNewMacro(vtkNetworkHierarchy);
@@ -139,9 +139,9 @@ int vtkNetworkHierarchy::RequestData(
for (vtkIdType i = 0; i < ipArray->GetNumberOfTuples(); ++i)
{
unsigned int packedID = this->ITON(ipArray->GetValue(i));
- SubnetMap.push_back(vtksys_stl::make_pair(packedID,i));
+ SubnetMap.push_back(std::make_pair(packedID,i));
}
- vtksys_stl::sort(SubnetMap.begin(), SubnetMap.end());
+ std::sort(SubnetMap.begin(), SubnetMap.end());
// Create builder for the tree
VTK_CREATE(vtkMutableDirectedGraph,builder);
@@ -232,7 +232,7 @@ int vtkNetworkHierarchy::RequestData(
treeTable->InsertNextBlankRow();
// Set the label for the child
- vtksys_ios::ostringstream subnetStream;
+ std::ostringstream subnetStream;
subnetStream << subnets[0];
treeTable->SetValueByName(treeIndex, this->IPArrayName, vtkVariant(subnetStream.str()));
@@ -261,7 +261,7 @@ int vtkNetworkHierarchy::RequestData(
treeTable->InsertNextBlankRow();
// Set the label for the child
- vtksys_ios::ostringstream subnetStream;
+ std::ostringstream subnetStream;
subnetStream << subnets[0] << "." << subnets[1];
treeTable->SetValueByName(treeIndex, this->IPArrayName, vtkVariant(subnetStream.str()));
@@ -290,7 +290,7 @@ int vtkNetworkHierarchy::RequestData(
treeTable->InsertNextBlankRow();
// Set the label for the child
- vtksys_ios::ostringstream subnetStream;
+ std::ostringstream subnetStream;
subnetStream << subnets[0] << "." << subnets[1] << "." << subnets[2];
treeTable->SetValueByName(treeIndex, this->IPArrayName, vtkVariant(subnetStream.str()));
diff --git a/Infovis/Core/vtkPipelineGraphSource.cxx b/Infovis/Core/vtkPipelineGraphSource.cxx
index 1f18c92d4b854fa316b8ef1f14dd20d223385f0d..ed9be6eef49f34830c8281c4d37b341ba74d654e 100644
--- a/Infovis/Core/vtkPipelineGraphSource.cxx
+++ b/Infovis/Core/vtkPipelineGraphSource.cxx
@@ -32,13 +32,8 @@
#include "vtkTree.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/stack>
-#include <vtksys/ios/sstream>
-
-using vtksys_stl::map;
-using vtksys_stl::stack;
-using vtksys_ios::ostringstream;
+#include <map>
+#include <sstream>
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
@@ -96,7 +91,7 @@ void vtkPipelineGraphSource::RemoveSink(vtkObject* sink)
static void InsertObject(
vtkObject* object,
- map<vtkObject*, vtkIdType>& object_map,
+ std::map<vtkObject*, vtkIdType>& object_map,
vtkMutableDirectedGraph* builder,
vtkStringArray* vertex_class_name_array,
vtkVariantArray* vertex_object_array,
@@ -177,7 +172,7 @@ int vtkPipelineGraphSource::RequestData(
edge_object_array->Delete();
// Recursively insert pipeline components into the graph ...
- map<vtkObject*, vtkIdType> object_map;
+ std::map<vtkObject*, vtkIdType> object_map;
for(vtkIdType i = 0; i != this->Sinks->GetNumberOfItems(); ++i)
{
InsertObject(this->Sinks->GetItemAsObject(i), object_map, builder, vertex_class_name_array, vertex_object_array, edge_output_port_array, edge_input_port_array, edge_class_name_array, edge_object_array);
diff --git a/Infovis/Core/vtkPruneTreeFilter.cxx b/Infovis/Core/vtkPruneTreeFilter.cxx
index 4704a1f03380912f29cf8466a51d0abd7092bc41..d4bc6dbf4465964dee0246f0bab4a765b8bd3989 100644
--- a/Infovis/Core/vtkPruneTreeFilter.cxx
+++ b/Infovis/Core/vtkPruneTreeFilter.cxx
@@ -31,8 +31,8 @@
#include "vtkTree.h"
#include "vtkTreeDFSIterator.h"
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
+#include <utility>
+#include <vector>
vtkStandardNewMacro(vtkPruneTreeFilter);
@@ -88,10 +88,10 @@ int vtkPruneTreeFilter::RequestData(
builder->GetFieldData()->DeepCopy(inputTree->GetFieldData());
// Build a copy of the tree, skipping the parent vertex to remove.
- vtksys_stl::vector< vtksys_stl::pair<vtkIdType, vtkIdType> > vertStack;
+ std::vector< std::pair<vtkIdType, vtkIdType> > vertStack;
if (inputTree->GetRoot() != this->ParentVertex)
{
- vertStack.push_back(vtksys_stl::make_pair(inputTree->GetRoot(), builder->AddVertex()));
+ vertStack.push_back(std::make_pair(inputTree->GetRoot(), builder->AddVertex()));
}
while (!vertStack.empty())
{
@@ -111,7 +111,7 @@ int vtkPruneTreeFilter::RequestData(
vtkIdType child = builder->AddVertex();
vtkEdgeType e = builder->AddEdge(v, child);
builderEdgeData->CopyData(inputEdgeData, tree_e.Id, e.Id);
- vertStack.push_back(vtksys_stl::make_pair(tree_child, child));
+ vertStack.push_back(std::make_pair(tree_child, child));
}
}
else
@@ -121,7 +121,7 @@ int vtkPruneTreeFilter::RequestData(
builderEdgeData->CopyData(inputEdgeData, tree_e.Id, e.Id);
if (tree_child != this->ParentVertex)
{
- vertStack.push_back(vtksys_stl::make_pair(tree_child, child));
+ vertStack.push_back(std::make_pair(tree_child, child));
}
else
{
diff --git a/Infovis/Core/vtkRandomGraphSource.cxx b/Infovis/Core/vtkRandomGraphSource.cxx
index 5ec84e635a9b2ad7115972c705921205d30ec172..0ed1dd16c8a30c87c2bfdbd8d58d6100208fcd8c 100644
--- a/Infovis/Core/vtkRandomGraphSource.cxx
+++ b/Infovis/Core/vtkRandomGraphSource.cxx
@@ -32,8 +32,8 @@
#include "vtkPointData.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/set>
-#include <vtksys/stl/algorithm>
+#include <set>
+#include <algorithm>
vtkStandardNewMacro(vtkRandomGraphSource);
@@ -167,7 +167,7 @@ vtkRandomGraphSource::RequestData(
else
{
// Don't duplicate edges.
- vtksys_stl::set< vtksys_stl::pair<vtkIdType, vtkIdType> > existingEdges;
+ std::set< std::pair<vtkIdType, vtkIdType> > existingEdges;
vtkIdType MaxEdges;
if (this->AllowParallelEdges)
@@ -211,7 +211,7 @@ vtkRandomGraphSource::RequestData(
}
}
- vtksys_stl::pair<vtkIdType, vtkIdType> newEdge(s, t);
+ std::pair<vtkIdType, vtkIdType> newEdge(s, t);
if (this->AllowParallelEdges
|| existingEdges.find(newEdge) == existingEdges.end())
diff --git a/Infovis/Core/vtkStringToCategory.cxx b/Infovis/Core/vtkStringToCategory.cxx
index 53e123c138249b035e2943c3b69926e7d9500e49..9c90f16ce2b370c96a9383fbb8209ceabecb60d1 100644
--- a/Infovis/Core/vtkStringToCategory.cxx
+++ b/Infovis/Core/vtkStringToCategory.cxx
@@ -35,7 +35,7 @@
#include "vtkStringArray.h"
#include "vtkTable.h"
-#include <vtksys/stl/set>
+#include <set>
vtkStandardNewMacro(vtkStringToCategory);
@@ -121,7 +121,7 @@ int vtkStringToCategory::RequestData(
fd->AddArray(catArr);
catArr->Delete();
vtkIdList* list = vtkIdList::New();
- vtksys_stl::set<vtkStdString> s;
+ std::set<vtkStdString> s;
int category = 0;
for (vtkIdType i = 0; i < numTuples*numComp; i++)
{
diff --git a/Infovis/Core/vtkTableToGraph.cxx b/Infovis/Core/vtkTableToGraph.cxx
index caedb2a5ae2394c12dff1d0315488ed864df2940..c7468a356febc6342b4f5fbd2d4d75d9151c5b89 100644
--- a/Infovis/Core/vtkTableToGraph.cxx
+++ b/Infovis/Core/vtkTableToGraph.cxx
@@ -44,10 +44,10 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/algorithm>
-#include <vtksys/stl/map>
-#include <vtksys/stl/set>
-#include <vtksys/stl/vector>
+#include <algorithm>
+#include <map>
+#include <set>
+#include <vector>
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
@@ -304,8 +304,8 @@ class vtkTableToGraphCompare
{
public:
bool operator()(
- const vtksys_stl::pair<vtkStdString, vtkVariant>& a,
- const vtksys_stl::pair<vtkStdString, vtkVariant>& b) const
+ const std::pair<vtkStdString, vtkVariant>& a,
+ const std::pair<vtkStdString, vtkVariant>& b) const
{
if (a.first != b.first)
{
@@ -327,7 +327,7 @@ template <typename T>
void vtkTableToGraphFindVertices(
T* arr, // The raw edge table column
vtkIdType size, // The size of the edge table column
- vtksys_stl::map<vtksys_stl::pair<vtkStdString, vtkVariant>, vtkIdType, vtkTableToGraphCompare>& vertexMap,
+ std::map<std::pair<vtkStdString, vtkVariant>, vtkIdType, vtkTableToGraphCompare>& vertexMap,
// A map of domain-value pairs to graph id
vtkStringArray *domainArr, // The domain of each vertex
vtkStringArray *labelArr, // The label of each vertex
@@ -340,7 +340,7 @@ void vtkTableToGraphFindVertices(
{
T v = arr[i];
vtkVariant val(v);
- vtksys_stl::pair<vtkStdString, vtkVariant> value(domain, val);
+ std::pair<vtkStdString, vtkVariant> value(domain, val);
if (vertexMap.count(value) == 0)
{
vtkIdType row = vertexTable->InsertNextBlankRow();
@@ -359,7 +359,7 @@ template <typename T>
void vtkTableToGraphFindHiddenVertices(
T* arr, // The raw edge table column
vtkIdType size, // The size of the edge table column
- vtksys_stl::map<vtksys_stl::pair<vtkStdString, vtkVariant>, vtkIdType, vtkTableToGraphCompare>& hiddenMap,
+ std::map<std::pair<vtkStdString, vtkVariant>, vtkIdType, vtkTableToGraphCompare>& hiddenMap,
// A map of domain-value pairs to hidden vertex id
vtkIdType & curHiddenVertex, // The current hidden vertex id
vtkStdString domain) // The domain of the array
@@ -368,7 +368,7 @@ void vtkTableToGraphFindHiddenVertices(
{
T v = arr[i];
vtkVariant val(v);
- vtksys_stl::pair<vtkStdString, vtkVariant> value(domain, val);
+ std::pair<vtkStdString, vtkVariant> value(domain, val);
if (hiddenMap.count(value) == 0)
{
hiddenMap[value] = curHiddenVertex;
@@ -443,7 +443,7 @@ int vtkTableToGraph::RequestData(
this->LinkGraph->GetVertexData()->GetAbstractArray("hidden"));
// Find all the hidden types
- vtksys_stl::set<vtkStdString> hiddenTypes;
+ std::set<vtkStdString> hiddenTypes;
if (linkHidden)
{
for (vtkIdType h = 0; h < linkHidden->GetNumberOfTuples(); h++)
@@ -486,9 +486,9 @@ int vtkTableToGraph::RequestData(
// Create the lookup maps for vertices and hidden vertices.
// When edges are added later, we need to be able to lookup the
// vertex ID for any domain-value pair.
- vtksys_stl::map<vtksys_stl::pair<vtkStdString, vtkVariant>,
+ std::map<std::pair<vtkStdString, vtkVariant>,
vtkIdType, vtkTableToGraphCompare> vertexMap;
- vtksys_stl::map<vtksys_stl::pair<vtkStdString, vtkVariant>,
+ std::map<std::pair<vtkStdString, vtkVariant>,
vtkIdType, vtkTableToGraphCompare> hiddenMap;
// Set up the vertex table. If we have one, just populate the
@@ -594,7 +594,7 @@ int vtkTableToGraph::RequestData(
// For each new domain encountered, iterate through the values
// of that column, adding vertices for each new value encountered.
- vtksys_stl::set<vtkStdString> domainSet;
+ std::set<vtkStdString> domainSet;
for (vtkIdType c = 0; c < linkDomain->GetNumberOfTuples(); c++)
{
vtkStdString domain = linkDomain->GetValue(c);
@@ -623,7 +623,7 @@ int vtkTableToGraph::RequestData(
for (vtkIdType i = 0; i < arr->GetNumberOfTuples(); ++i)
{
vtkVariant val = vertexTable->GetValueByName(i, domain);
- vtksys_stl::pair<vtkStdString, vtkVariant> value(domain, val);
+ std::pair<vtkStdString, vtkVariant> value(domain, val);
// Fancy check for whether we have a valid value.
// 1. It must not exist yet in the vertex map.
// 2. The variant value must be valid.
@@ -720,8 +720,8 @@ int vtkTableToGraph::RequestData(
VTK_CREATE(vtkDataSetAttributes, edgeTableData);
edgeTableData->ShallowCopy(edgeTable->GetRowData());
builder->GetEdgeData()->CopyAllocate(edgeTableData);
- vtksys_stl::map<vtkIdType, vtksys_stl::vector< vtksys_stl::pair<vtkIdType, vtkIdType> > > hiddenInEdges;
- vtksys_stl::map<vtkIdType, vtksys_stl::vector<vtkIdType> > hiddenOutEdges;
+ std::map<vtkIdType, std::vector< std::pair<vtkIdType, vtkIdType> > > hiddenInEdges;
+ std::map<vtkIdType, std::vector<vtkIdType> > hiddenOutEdges;
int numHiddenToHiddenEdges = 0;
VTK_CREATE(vtkEdgeListIterator, edges);
for (vtkIdType r = 0; r < edgeTable->GetNumberOfRows(); r++)
@@ -772,8 +772,8 @@ int vtkTableToGraph::RequestData(
vtkSuperExtraExtendedTemplateMacro(valueTarget = vtkTableToGraphGetValue(
static_cast<VTK_TT*>(columnTarget->GetVoidPointer(0)), r));
}
- vtksys_stl::pair<vtkStdString, vtkVariant> lookupSource(typeSource, vtkVariant(valueSource));
- vtksys_stl::pair<vtkStdString, vtkVariant> lookupTarget(typeTarget, vtkVariant(valueTarget));
+ std::pair<vtkStdString, vtkVariant> lookupSource(typeSource, vtkVariant(valueSource));
+ std::pair<vtkStdString, vtkVariant> lookupTarget(typeTarget, vtkVariant(valueTarget));
vtkIdType source = -1;
vtkIdType target = -1;
if (!hiddenSource && vertexMap.count(lookupSource) > 0)
@@ -815,7 +815,7 @@ int vtkTableToGraph::RequestData(
}
else if (!hiddenSource && hiddenTarget)
{
- hiddenInEdges[target].push_back(vtksys_stl::make_pair(source, r));
+ hiddenInEdges[target].push_back(std::make_pair(source, r));
}
else
{
@@ -835,16 +835,16 @@ int vtkTableToGraph::RequestData(
}
// Now add hidden edges.
- vtksys_stl::map<vtkIdType, vtksys_stl::vector<vtkIdType> >::iterator out, outEnd;
+ std::map<vtkIdType, std::vector<vtkIdType> >::iterator out, outEnd;
out = hiddenOutEdges.begin();
outEnd = hiddenOutEdges.end();
vtkIdType curHidden = 0;
vtkIdType numHidden = static_cast<vtkIdType>(hiddenOutEdges.size());
for (; out != outEnd; ++out)
{
- vtksys_stl::vector<vtkIdType> outVerts = out->second;
- vtksys_stl::vector< vtksys_stl::pair<vtkIdType, vtkIdType> > inVerts = hiddenInEdges[out->first];
- vtksys_stl::vector<vtkIdType>::size_type i, j;
+ std::vector<vtkIdType> outVerts = out->second;
+ std::vector< std::pair<vtkIdType, vtkIdType> > inVerts = hiddenInEdges[out->first];
+ std::vector<vtkIdType>::size_type i, j;
for (i = 0; i < inVerts.size(); ++i)
{
vtkIdType inVertId = inVerts[i].first;
diff --git a/Infovis/Core/vtkTransferAttributes.cxx b/Infovis/Core/vtkTransferAttributes.cxx
index e4af41eaacd9f7920b3f35e784f58a317dfc9bd0..06bbab7a48e491b647c319bb33d09e89677f47d1 100644
--- a/Infovis/Core/vtkTransferAttributes.cxx
+++ b/Infovis/Core/vtkTransferAttributes.cxx
@@ -39,8 +39,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkTree.h"
#include "vtkVariantArray.h"
-#include <vtksys/stl/map>
-using vtksys_stl::map;
+#include <map>
//---------------------------------------------------------------------------
template <typename T>
@@ -232,7 +231,7 @@ int vtkTransferAttributes::RequestData(
// If we are using DirectMapping this is trivial
// we just create an identity map
int i;
- map<vtkIdType, vtkIdType> sourceIndexToTargetIndex;
+ std::map<vtkIdType, vtkIdType> sourceIndexToTargetIndex;
if (this->DirectMapping)
{
if (sourceIdArray->GetNumberOfTuples() > targetIdArray->GetNumberOfTuples())
@@ -252,7 +251,7 @@ int vtkTransferAttributes::RequestData(
// type to a nice vtkIdType to vtkIdType mapping
if (!this->DirectMapping)
{
- map<vtkVariant,vtkIdType,vtkVariantLessThan> sourceInputIdMap;
+ std::map<vtkVariant,vtkIdType,vtkVariantLessThan> sourceInputIdMap;
// Create a map from sourceInput id to sourceInput index
for( i=0; i<sourceIdArray->GetNumberOfTuples(); i++)
diff --git a/Infovis/Layout/vtkArcParallelEdgeStrategy.cxx b/Infovis/Layout/vtkArcParallelEdgeStrategy.cxx
index f75084084bd775901099c4618a8c09b0668ab770..b98a21a13ed6ea8a5377a0e2894c0a6a7c0a96f5 100644
--- a/Infovis/Layout/vtkArcParallelEdgeStrategy.cxx
+++ b/Infovis/Layout/vtkArcParallelEdgeStrategy.cxx
@@ -28,9 +28,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(vtkArcParallelEdgeStrategy);
@@ -46,9 +46,9 @@ vtkArcParallelEdgeStrategy::~vtkArcParallelEdgeStrategy()
void vtkArcParallelEdgeStrategy::Layout()
{
bool directed = vtkDirectedGraph::SafeDownCast(this->Graph) != 0;
- vtksys_stl::map<vtksys_stl::pair<vtkIdType, vtkIdType>, int> edgeCount;
- vtksys_stl::map<vtksys_stl::pair<vtkIdType, vtkIdType>, int> edgeNumber;
- vtksys_stl::vector<vtkEdgeType> edgeVector(this->Graph->GetNumberOfEdges());
+ std::map<std::pair<vtkIdType, vtkIdType>, int> edgeCount;
+ std::map<std::pair<vtkIdType, vtkIdType>, int> edgeNumber;
+ std::vector<vtkEdgeType> edgeVector(this->Graph->GetNumberOfEdges());
vtkSmartPointer<vtkEdgeListIterator> it =
vtkSmartPointer<vtkEdgeListIterator>::New();
this->Graph->GetEdges(it);
@@ -67,7 +67,7 @@ void vtkArcParallelEdgeStrategy::Layout()
src = e.Target;
tgt = e.Source;
}
- edgeCount[vtksys_stl::pair<vtkIdType, vtkIdType>(src, tgt)]++;
+ edgeCount[std::pair<vtkIdType, vtkIdType>(src, tgt)]++;
edgeVector[e.Id] = e;
// Compute edge length
@@ -106,11 +106,11 @@ void vtkArcParallelEdgeStrategy::Layout()
// Lookup the total number of edges with this source
// and target, as well as how many times this pair
// has been found so far.
- vtksys_stl::pair<vtkIdType,vtkIdType> p(src, tgt);
+ std::pair<vtkIdType,vtkIdType> p(src, tgt);
edgeNumber[p]++;
int cur = edgeNumber[p];
int total = edgeCount[p];
- vtksys_stl::pair<vtkIdType,vtkIdType> revP(tgt, src);
+ std::pair<vtkIdType,vtkIdType> revP(tgt, src);
int revTotal = edgeCount[revP];
double sourcePt[3];
diff --git a/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.cxx b/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.cxx
index 52fb9a272f10ded3c0522a428ebe268e0d28d146..f815fbd945edbf98c81cdef15b4f10f4e64631b4 100644
--- a/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.cxx
+++ b/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.cxx
@@ -41,7 +41,7 @@
#include "vtkSmartPointer.h"
#include "vtkTree.h"
-#include <vtksys/stl/vector>
+#include <vector>
class vtkAttributeClustering2DLayoutStrategy::Internals
{
@@ -58,7 +58,7 @@ public:
// really happens in these days of magical compilers
} vtkLayoutEdge;
- vtksys_stl::vector<vtkLayoutEdge> Edges;
+ std::vector<vtkLayoutEdge> Edges;
};
@@ -422,7 +422,7 @@ void vtkAttributeClustering2DLayoutStrategy::Layout()
// Calculate the attractive forces
float *rawAttractArray = this->AttractionArray->GetPointer(0);
- vtksys_stl::vector<Internals::vtkLayoutEdge>::iterator iter;
+ std::vector<Internals::vtkLayoutEdge>::iterator iter;
for (iter = this->Implementation->Edges.begin(); iter != this->Implementation->Edges.end(); ++iter)
{
// Check for dead edge
diff --git a/Infovis/Layout/vtkGeoEdgeStrategy.cxx b/Infovis/Layout/vtkGeoEdgeStrategy.cxx
index 5b1407f0b1d7665eb6fa65a1ee29a687930e6883..ae302970dc5e7f6c667d7eca65ebfda5eb2d3f43 100644
--- a/Infovis/Layout/vtkGeoEdgeStrategy.cxx
+++ b/Infovis/Layout/vtkGeoEdgeStrategy.cxx
@@ -33,9 +33,9 @@
#include "vtkPointData.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
-#include <vtksys/stl/map>
+#include <utility>
+#include <vector>
+#include <map>
vtkStandardNewMacro(vtkGeoEdgeStrategy);
@@ -48,9 +48,9 @@ vtkGeoEdgeStrategy::vtkGeoEdgeStrategy()
void vtkGeoEdgeStrategy::Layout()
{
- vtksys_stl::map<vtksys_stl::pair<vtkIdType, vtkIdType>, int> edgeCount;
- vtksys_stl::map<vtksys_stl::pair<vtkIdType, vtkIdType>, int> edgeNumber;
- vtksys_stl::vector<vtkEdgeType> edgeVector(this->Graph->GetNumberOfEdges());
+ std::map<std::pair<vtkIdType, vtkIdType>, int> edgeCount;
+ std::map<std::pair<vtkIdType, vtkIdType>, int> edgeNumber;
+ std::vector<vtkEdgeType> edgeVector(this->Graph->GetNumberOfEdges());
vtkSmartPointer<vtkEdgeListIterator> it =
vtkSmartPointer<vtkEdgeListIterator>::New();
this->Graph->GetEdges(it);
@@ -68,7 +68,7 @@ void vtkGeoEdgeStrategy::Layout()
src = e.Target;
tgt = e.Source;
}
- edgeCount[vtksys_stl::pair<vtkIdType, vtkIdType>(src, tgt)]++;
+ edgeCount[std::pair<vtkIdType, vtkIdType>(src, tgt)]++;
edgeVector[e.Id] = e;
}
vtkIdType numEdges = this->Graph->GetNumberOfEdges();
@@ -90,7 +90,7 @@ void vtkGeoEdgeStrategy::Layout()
// Lookup the total number of edges with this source
// and target, as well as how many times this pair
// has been found so far.
- vtksys_stl::pair<vtkIdType,vtkIdType> p(src, tgt);
+ std::pair<vtkIdType,vtkIdType> p(src, tgt);
edgeNumber[p]++;
int cur = edgeNumber[p];
int total = edgeCount[p];
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx
index cd032cf3fb06c136bfddbc59d320891e70dcf9f5..fe06125143c30a6dee6b78d489d04f553ea52660 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx
@@ -56,7 +56,7 @@ namespace
void TestPSQLGraphReader()
{
- vtksys_ios::ostringstream oss;
+ std::ostringstream oss;
// Make a database containing a cycle.
int vertices = 11;
vtkSmartPointer<vtkSQLiteDatabase> db =
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx
index 2afe4cbff75553e49e160c1352cf086820a5e244..c20e886f063fbfa62493a28730b24a29e5e3ab6c 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx
@@ -56,7 +56,7 @@ namespace
void TestPSQLGraphReader()
{
- vtksys_ios::ostringstream oss;
+ std::ostringstream oss;
// Make a database containing a cycle.
int vertices = 11;
vtkSmartPointer<vtkSQLiteDatabase> db =
diff --git a/Infovis/Parallel/Testing/Cxx/TestPBGLPipeline.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLPipeline.cxx
index 654c34600f8fb3a2d37c5ab3bb544a120db86afa..d9eb74dad9d63c967cdbc729983f519dfc2eff12 100644
--- a/Infovis/Parallel/Testing/Cxx/TestPBGLPipeline.cxx
+++ b/Infovis/Parallel/Testing/Cxx/TestPBGLPipeline.cxx
@@ -182,7 +182,7 @@ int TestPBGLPipeline(int argc, char* argv[])
else
{
// Create an in-memory database containing a cycle graph.
- vtksys_ios::ostringstream oss;
+ std::ostringstream oss;
int vertices = 10000;
db = vtkSmartPointer<vtkSQLiteDatabase>::New();
vtkSQLiteDatabase::SafeDownCast(db)->SetDatabaseFileName(":memory:");
diff --git a/Infovis/Parallel/vtkPBGLCollapseParallelEdges.cxx b/Infovis/Parallel/vtkPBGLCollapseParallelEdges.cxx
index 6bfbf170cad001fdc991fcc85d3902f99d5d895b..7f6043a191ad33bb00d0bb5ff69397b98be10f0e 100644
--- a/Infovis/Parallel/vtkPBGLCollapseParallelEdges.cxx
+++ b/Infovis/Parallel/vtkPBGLCollapseParallelEdges.cxx
@@ -38,8 +38,8 @@
#include "vtkVariantArray.h"
#include "vtkVertexListIterator.h"
-#include <vtksys/stl/map>
-#include <vtksys/stl/utility> // for pair
+#include <map>
+#include <utility> // for pair
vtkStandardNewMacro(vtkPBGLCollapseParallelEdges);
@@ -115,7 +115,7 @@ int vtkPBGLCollapseParallelEdgesRequestData(
output_helper->Synchronize();
// Iterate through input edges, adding a new edge for every new (source,target) pair.
- vtksys_stl::map<vtksys_stl::pair<vtkIdType, vtkIdType>, int> edge_weights;
+ std::map<std::pair<vtkIdType, vtkIdType>, int> edge_weights;
vtkSmartPointer<vtkOutEdgeIterator> out_edges
= vtkSmartPointer<vtkOutEdgeIterator>::New();
input->GetVertices(vertices);
@@ -134,7 +134,7 @@ int vtkPBGLCollapseParallelEdgesRequestData(
a = e.Target;
b = u;
}
- vtksys_stl::pair<vtkIdType,vtkIdType> p(a, b);
+ std::pair<vtkIdType,vtkIdType> p(a, b);
if (edge_weights.count(p) > 0)
{
edge_weights[p]++;
@@ -146,7 +146,7 @@ int vtkPBGLCollapseParallelEdgesRequestData(
}
}
- vtksys_stl::map<vtksys_stl::pair<vtkIdType, vtkIdType>, int>::iterator wi;
+ std::map<std::pair<vtkIdType, vtkIdType>, int>::iterator wi;
for (wi = edge_weights.begin(); wi != edge_weights.end(); ++wi)
{
builder->LazyAddEdge(wi->first.first, wi->first.second);
@@ -159,7 +159,7 @@ int vtkPBGLCollapseParallelEdgesRequestData(
while (edges->HasNext())
{
vtkEdgeType e = edges->Next();
- vtksys_stl::pair<vtkIdType,vtkIdType> p(e.Source, e.Target);
+ std::pair<vtkIdType,vtkIdType> p(e.Source, e.Target);
weight_arr->InsertNextValue(edge_weights[p]);
//put(distrib_weight_arr, e, edge_weights[p]);
}
diff --git a/Infovis/Parallel/vtkPBGLGraphSQLReader.cxx b/Infovis/Parallel/vtkPBGLGraphSQLReader.cxx
index f9a74c9982dc3f30304172cab4705014459944b0..86147ec5ea42ea0675d6e24d9a7637d6266e1f2f 100644
--- a/Infovis/Parallel/vtkPBGLGraphSQLReader.cxx
+++ b/Infovis/Parallel/vtkPBGLGraphSQLReader.cxx
@@ -165,7 +165,7 @@ int vtkPBGLGraphSQLReaderRequestData(
MutableGraph* builder = MutableGraph::New();
// Set up vertex and edge queries
- vtksys_ios::ostringstream oss;
+ std::ostringstream oss;
oss << "select count(*) from " << self->GetVertexTable();
vtkSmartPointer<vtkSQLQuery> vertex_count;
vertex_count.TakeReference(self->GetDatabase()->GetQueryInstance());
diff --git a/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx
index c1d725759d042bfe6a1fe3cca89ce43d0d94f5a2..bfa19bcb28cf3f346b51f942cd011591526c31f3 100644
--- a/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx
@@ -48,7 +48,7 @@ public:
this->Mapper->SetInputData( selection );
// Update cardinality of selection
- vtksys_ios::ostringstream txt;
+ std::ostringstream txt;
txt << "Number of selected elements: " << ( selection ? selection->GetNumberOfCells() : 0 );
this->Text->SetInput( txt.str().c_str() );
}
@@ -169,7 +169,7 @@ int TestBrokenLineWidget( int argc, char *argv[] )
// Annotate with number of elements
vtkSmartPointer<vtkTextActor> txtActor = vtkSmartPointer<vtkTextActor>::New();
- vtksys_ios::ostringstream txt;
+ std::ostringstream txt;
txt << "Number of selected elements: " << ( selection ? selection->GetNumberOfCells() : 0 );
txtActor->SetInput( txt.str().c_str() );
txtActor->SetTextScaleModeToViewport();
diff --git a/Interaction/Widgets/vtkBiDimensionalRepresentation2D.cxx b/Interaction/Widgets/vtkBiDimensionalRepresentation2D.cxx
index e85ed30427aa98b8f03da7add0954b03312bf5c5..6ea5600153cde9fa1d47b9e8e45d0d8dcf0fa5b4 100644
--- a/Interaction/Widgets/vtkBiDimensionalRepresentation2D.cxx
+++ b/Interaction/Widgets/vtkBiDimensionalRepresentation2D.cxx
@@ -657,7 +657,7 @@ void vtkBiDimensionalRepresentation2D::BuildRepresentation()
{
line2Dist = sqrt(vtkMath::Distance2BetweenPoints(wp3, wp4));
}
- vtksys_ios::ostringstream label;
+ std::ostringstream label;
if (this->IDInitialized)
{
label << this->ID << ": ";
diff --git a/Parallel/Core/Testing/Cxx/TestSocketCommunicator.cxx b/Parallel/Core/Testing/Cxx/TestSocketCommunicator.cxx
index bc1e6c5e050772fb990cf67017dfe0bcb4eec443..93e5c7273faf03e911f7e8457e0b4bddd671c3da 100644
--- a/Parallel/Core/Testing/Cxx/TestSocketCommunicator.cxx
+++ b/Parallel/Core/Testing/Cxx/TestSocketCommunicator.cxx
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
}
}
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
stream << testing->GetTempDirectory() << "/TestSocketCommunicator."
<< (is_server? "server" : "client") << ".log";
// initialize the socket controller.
diff --git a/Rendering/Annotation/vtkPolarAxesActor.cxx b/Rendering/Annotation/vtkPolarAxesActor.cxx
index 9898505c74029e10da3f1263d63f8af85d5edf17..070eb3eaea1a0b0f488aa9dc130f5604c21c320f 100644
--- a/Rendering/Annotation/vtkPolarAxesActor.cxx
+++ b/Rendering/Annotation/vtkPolarAxesActor.cxx
@@ -684,7 +684,7 @@ void vtkPolarAxesActor::BuildRadialAxes()
// Use polar angle as a title for the radial axis
axis->SetTitleVisibility( this->RadialTitleVisibility );
axis->GetTitleTextProperty()->SetColor( this->RadialAxesProperty->GetColor() );
- vtksys_ios::ostringstream title;
+ std::ostringstream title;
title << alpha
<< ( this->RadialUnits ? " deg" : "" );
axis->SetTitle( title.str().c_str() );
diff --git a/Rendering/Core/Testing/Cxx/otherCoordinate.cxx b/Rendering/Core/Testing/Cxx/otherCoordinate.cxx
index 074306762499516a0ceaf38fbf175a8ace03aca0..5e5b37bd64783d5c7b2b3f1399e89eb6c8bbde5c 100644
--- a/Rendering/Core/Testing/Cxx/otherCoordinate.cxx
+++ b/Rendering/Core/Testing/Cxx/otherCoordinate.cxx
@@ -170,6 +170,6 @@ int Test(ostream& strm)
int otherCoordinate(int,char *[])
{
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
return Test(vtkmsg_with_warning_C4701);
}
diff --git a/Rendering/Core/vtkGenericVertexAttributeMapping.cxx b/Rendering/Core/vtkGenericVertexAttributeMapping.cxx
index 97e85e9dce814b25da0d7ccff12203aa85aca06c..c0bce2374bd3b5d9d8684b9d1dbd1aebf4a80af0 100644
--- a/Rendering/Core/vtkGenericVertexAttributeMapping.cxx
+++ b/Rendering/Core/vtkGenericVertexAttributeMapping.cxx
@@ -80,7 +80,7 @@ void vtkGenericVertexAttributeMapping::AddMapping(
int unit, const char* arrayName, int fieldAssociation,
int component)
{
- vtksys_ios::ostringstream attributeName;
+ std::ostringstream attributeName;
attributeName << unit;
if (this->RemoveMapping(attributeName.str().c_str()))
diff --git a/Rendering/Core/vtkInteractorEventRecorder.cxx b/Rendering/Core/vtkInteractorEventRecorder.cxx
index f5716ce2d6e01f1254c36d56b99f56d230fe31cd..5b829316519507cb47391f2e968a03a459cf7131 100644
--- a/Rendering/Core/vtkInteractorEventRecorder.cxx
+++ b/Rendering/Core/vtkInteractorEventRecorder.cxx
@@ -21,6 +21,7 @@
#include <cassert>
#include <locale>
#include <vtksys/SystemTools.hxx>
+#include <string>
vtkStandardNewMacro(vtkInteractorEventRecorder);
@@ -175,7 +176,7 @@ void vtkInteractorEventRecorder::Play()
}
std::string inputStr(this->InputString, len);
delete this->InputStream;
- this->InputStream = new vtksys_ios::istringstream(inputStr);
+ this->InputStream = new std::istringstream(inputStr);
if (this->InputStream->fail())
{
vtkErrorMacro(<< "Unable to read from string");
@@ -204,11 +205,11 @@ void vtkInteractorEventRecorder::Play()
char event[128], keySym[64];
int pos[2], ctrlKey, shiftKey, keyCode, repeatCount;
float stream_version = 0.0f, tempf;
- vtksys_stl::string line;
+ std::string line;
while ( vtksys::SystemTools::GetLineFromStream(*this->InputStream, line) )
{
- vtksys_ios::istringstream iss(line);
+ std::istringstream iss(line);
// Use classic locale, we don't want to parse float values with
// user-defined locale.
diff --git a/Rendering/Label/vtkDynamic2DLabelMapper.cxx b/Rendering/Label/vtkDynamic2DLabelMapper.cxx
index 0f2a30291c77d8af75c57f7cab2a6bbdd0d281a8..8e982944ded8ed47d6b8300aa1c4d46bb385fddc 100644
--- a/Rendering/Label/vtkDynamic2DLabelMapper.cxx
+++ b/Rendering/Label/vtkDynamic2DLabelMapper.cxx
@@ -47,7 +47,7 @@
#include "vtkViewport.h"
#include <vtksys/ios/fstream>
-using vtksys_ios::ofstream;
+using std::ofstream;
#if defined(_WIN32) && !defined(__CYGWIN__)
# define SNPRINTF _snprintf
diff --git a/Rendering/Label/vtkLabelHierarchyCompositeIterator.cxx b/Rendering/Label/vtkLabelHierarchyCompositeIterator.cxx
index 11f218255fa441ea5fa88c678c6b216c07c44925..02f4c5f93fc1be88fc219e95bde7017934d34d24 100644
--- a/Rendering/Label/vtkLabelHierarchyCompositeIterator.cxx
+++ b/Rendering/Label/vtkLabelHierarchyCompositeIterator.cxx
@@ -23,15 +23,15 @@
#include "vtkObjectFactory.h"
#include "vtkSmartPointer.h"
-#include <vtksys/stl/utility>
-#include <vtksys/stl/vector>
+#include <utility>
+#include <vector>
vtkStandardNewMacro(vtkLabelHierarchyCompositeIterator);
class vtkLabelHierarchyCompositeIterator::Internal
{
public:
- typedef vtksys_stl::vector<vtksys_stl::pair<vtkSmartPointer<vtkLabelHierarchyIterator>, int> > IteratorVector;
+ typedef std::vector<std::pair<vtkSmartPointer<vtkLabelHierarchyIterator>, int> > IteratorVector;
IteratorVector Iterators;
IteratorVector::size_type CurrentIterator;
IteratorVector::size_type InitialTraversal;
@@ -54,7 +54,7 @@ vtkLabelHierarchyCompositeIterator::~vtkLabelHierarchyCompositeIterator()
void vtkLabelHierarchyCompositeIterator::AddIterator(vtkLabelHierarchyIterator* it, int count)
{
this->Implementation->Iterators.push_back(
- vtksys_stl::make_pair(vtkSmartPointer<vtkLabelHierarchyIterator>(it), count));
+ std::make_pair(vtkSmartPointer<vtkLabelHierarchyIterator>(it), count));
}
void vtkLabelHierarchyCompositeIterator::ClearIterators()
diff --git a/Rendering/OpenGL/vtkCocoaRenderWindow.mm b/Rendering/OpenGL/vtkCocoaRenderWindow.mm
index 2a8acdc69d089244c9e30f955e48e5bc14db67e1..be95108ca7c9d44cd0aa220e188932c504a1be5a 100644
--- a/Rendering/OpenGL/vtkCocoaRenderWindow.mm
+++ b/Rendering/OpenGL/vtkCocoaRenderWindow.mm
@@ -432,7 +432,7 @@ const char* vtkCocoaRenderWindow::ReportCapabilities()
const char* glVersion = (const char*) glGetString(GL_VERSION);
const char* glExtensions = (const char*) glGetString(GL_EXTENSIONS);
- vtksys_ios::ostringstream strm;
+ std::ostringstream strm;
strm << "OpenGL vendor string: " << glVendor
<< "\nOpenGL renderer string: " << glRenderer
<< "\nOpenGL version string: " << glVersion
diff --git a/Rendering/OpenGL/vtkOSOpenGLRenderWindow.cxx b/Rendering/OpenGL/vtkOSOpenGLRenderWindow.cxx
index 99a497802bb8bc15ec41a29f9aafb5452c5957ce..d98d7cd17e89be58b0c3d634fcc4bf3bb5030a1e 100644
--- a/Rendering/OpenGL/vtkOSOpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL/vtkOSOpenGLRenderWindow.cxx
@@ -455,7 +455,7 @@ const char* vtkOSOpenGLRenderWindow::ReportCapabilities()
const char *glVersion = (const char *) glGetString(GL_VERSION);
const char *glExtensions = (const char *) glGetString(GL_EXTENSIONS);
- vtksys_ios::ostringstream strm;
+ std::ostringstream strm;
strm << "OpenGL vendor string: " << glVendor << endl;
strm << "OpenGL renderer string: " << glRenderer << endl;
strm << "OpenGL version string: " << glVersion << endl;
diff --git a/Rendering/OpenGL/vtkShaderProgram2.cxx b/Rendering/OpenGL/vtkShaderProgram2.cxx
index d736da491219afdaa4abd6bb0e647195e54532d2..4ceb4931605f3dbd8a6d4a5d1f250ef0d1965afe 100644
--- a/Rendering/OpenGL/vtkShaderProgram2.cxx
+++ b/Rendering/OpenGL/vtkShaderProgram2.cxx
@@ -318,7 +318,7 @@ bool vtkShaderProgram2::DisplayListUnderCreationInCompileMode()
{
if (value != GL_COMPILE_AND_EXECUTE)
{
- vtksys_ios::ostringstream ost;
+ std::ostringstream ost;
ost << "Unexpected display list creation mode:" << hex << value << dec;
vtkErrorMacro(<< ost.str().c_str());
}
@@ -896,7 +896,7 @@ void vtkShaderProgram2::PrintActiveUniformVariables(
int element = 0;
while (element<size)
{
- vtksys_ios::ostringstream ost2;
+ std::ostringstream ost2;
ost2 << name;
if (size > 1)
{
diff --git a/Rendering/OpenGL/vtkShadowMapBakerPass.cxx b/Rendering/OpenGL/vtkShadowMapBakerPass.cxx
index e5e846c755ec0256fbe2544a124cf04fbec377eb..15aef0c5fe0b24f99386021fea00fd98f8e1a105 100644
--- a/Rendering/OpenGL/vtkShadowMapBakerPass.cxx
+++ b/Rendering/OpenGL/vtkShadowMapBakerPass.cxx
@@ -615,7 +615,7 @@ void vtkShadowMapBakerPass::Render(const vtkRenderState *s)
state->Update();
vtkIndent indent;
- vtksys_ios::ostringstream ost00;
+ std::ostringstream ost00;
ost00.setf(ios::fixed,ios::floatfield);
ost00.precision(5);
ost00 << "OpenGLState_" << pthread_self() << "_"
@@ -627,7 +627,7 @@ void vtkShadowMapBakerPass::Render(const vtkRenderState *s)
#ifdef VTK_SHADOW_MAP_BAKER_PASS_DEBUG
state->Update();
- vtksys_ios::ostringstream ost01;
+ std::ostringstream ost01;
ost01.setf(ios::fixed,ios::floatfield);
ost01.precision(5);
ost01 << "OpenGLState_" << pthread_self() << "_"
diff --git a/Rendering/OpenGL/vtkShadowMapPass.cxx b/Rendering/OpenGL/vtkShadowMapPass.cxx
index f703244ec4c57910a5b5392f45162a3884d0168c..4299f816074add74ecf54e686c19633ff1237525 100644
--- a/Rendering/OpenGL/vtkShadowMapPass.cxx
+++ b/Rendering/OpenGL/vtkShadowMapPass.cxx
@@ -334,9 +334,9 @@ void vtkShadowMapPass::Render(const vtkRenderState *s)
shaders->RemoveAllItems();
size_t nbLights=
this->ShadowMapBakerPass->GetShadowMaps()->Vector.size();
- vtksys_ios::ostringstream ostVS;
+ std::ostringstream ostVS;
- vtksys_ios::ostringstream numLights;
+ std::ostringstream numLights;
numLights << endl << "#define VTK_LIGHTING_NUMBER_OF_LIGHTS " << nbLights << endl;
vtkStdString vertShader(vtkShadowMapPassShader_vs);
@@ -349,7 +349,7 @@ void vtkShadowMapPass::Render(const vtkRenderState *s)
vtkStdString *vsCode=new vtkStdString;
(*vsCode)=ostVS.str();
- vtksys_ios::ostringstream ostLightingVS;
+ std::ostringstream ostLightingVS;
vtkStdString lightShader(vtkLighting_s);
version_loc = lightShader.find("#version 110");
@@ -362,7 +362,7 @@ void vtkShadowMapPass::Render(const vtkRenderState *s)
(*lightingVsCode)=ostLightingVS.str();
- vtksys_ios::ostringstream ostFS;
+ std::ostringstream ostFS;
vtkStdString fragShader(vtkShadowMapPassShader_fs);
version_loc = fragShader.find("#version 110");
@@ -550,7 +550,7 @@ void vtkShadowMapPass::Render(const vtkRenderState *s)
map->SetMinificationFilter(vtkTextureObject::Linear);
map->Bind();
- vtksys_ios::ostringstream ostShadowMapTextureUnit;
+ std::ostringstream ostShadowMapTextureUnit;
ostShadowMapTextureUnit << "shadowMaps[" << shadowingLightIndex << "]";
vtkStdString *shadowMapTextureUnitString=new vtkStdString;
diff --git a/Rendering/OpenGL/vtkShadowMapPassInternal.h b/Rendering/OpenGL/vtkShadowMapPassInternal.h
index 5a304784935d2aa547bb3f8eb116c5768a6b0e8f..a0f333dc3f77339ec0e891ffc76fc770de677b7d 100644
--- a/Rendering/OpenGL/vtkShadowMapPassInternal.h
+++ b/Rendering/OpenGL/vtkShadowMapPassInternal.h
@@ -22,16 +22,17 @@
#include "vtkCamera.h"
#include "vtkTextureObject.h"
+#include <vector>
class vtkShadowMapBakerPassTextures
{
public:
- vtksys_stl::vector<vtkSmartPointer<vtkTextureObject> > Vector;
+ std::vector<vtkSmartPointer<vtkTextureObject> > Vector;
};
class vtkShadowMapBakerPassLightCameras
{
public:
- vtksys_stl::vector<vtkSmartPointer<vtkCamera> > Vector;
+ std::vector<vtkSmartPointer<vtkCamera> > Vector;
};
#endif
diff --git a/Rendering/OpenGL/vtkUniformVariables.cxx b/Rendering/OpenGL/vtkUniformVariables.cxx
index 2e21dd088aa8ec50284d09168ad4ed29304f0c80..be39a79a3e285bbeda3dc5b54967622dd1ba7eff 100644
--- a/Rendering/OpenGL/vtkUniformVariables.cxx
+++ b/Rendering/OpenGL/vtkUniformVariables.cxx
@@ -19,7 +19,7 @@
#include "vtkObjectFactory.h"
#include "vtkOpenGLError.h"
-#include <vtksys/stl/map>
+#include <map>
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkUniformVariables);
@@ -666,8 +666,8 @@ protected:
int Columns;
};
-typedef vtksys_stl::map<const char *, vtkUniform *, ltstr> UniformMap;
-typedef vtksys_stl::map<const char *, vtkUniform *, ltstr>::iterator UniformMapIt;
+typedef std::map<const char *, vtkUniform *, ltstr> UniformMap;
+typedef std::map<const char *, vtkUniform *, ltstr>::iterator UniformMapIt;
class vtkUniformVariablesMap
{
@@ -752,7 +752,7 @@ void vtkUniformVariables::SetUniformi(const char *name,
u=new vtkUniformVectorInt(numberOfComponents,value);
u->SetName(name);
- vtksys_stl::pair<const char *, vtkUniform *> p;
+ std::pair<const char *, vtkUniform *> p;
p.first=u->GetName(); // cannot be `name' because
// we don't manage this pointer.
p.second=u;
@@ -814,7 +814,7 @@ void vtkUniformVariables::SetUniformf(const char *name,
u=new vtkUniformVectorFloat(numberOfComponents,value);
u->SetName(name);
- vtksys_stl::pair<const char *, vtkUniform *> p;
+ std::pair<const char *, vtkUniform *> p;
p.first=u->GetName(); // cannot be `name' because
// we don't manage this pointer.
p.second=u;
@@ -882,7 +882,7 @@ void vtkUniformVariables::SetUniformiv(const char *name,
u=new vtkUniformArrayInt(numberOfComponents,numberOfElements,value);
u->SetName(name);
- vtksys_stl::pair<const char *, vtkUniform *> p;
+ std::pair<const char *, vtkUniform *> p;
p.first=u->GetName(); // cannot be `name' because
// we don't manage this pointer.
p.second=u;
@@ -950,7 +950,7 @@ void vtkUniformVariables::SetUniformfv(const char *name,
u=new vtkUniformArrayFloat(numberOfComponents,numberOfElements,value);
u->SetName(name);
- vtksys_stl::pair<const char *, vtkUniform *> p;
+ std::pair<const char *, vtkUniform *> p;
p.first=u->GetName(); // cannot be `name' because
// we don't manage this pointer.
p.second=u;
@@ -1012,7 +1012,7 @@ void vtkUniformVariables::SetUniformMatrix(const char *name,
{
vtkUniform *u=new vtkUniformMatrix(rows,columns,value);
u->SetName(name);
- vtksys_stl::pair<const char *, vtkUniform *> p;
+ std::pair<const char *, vtkUniform *> p;
p.first=u->GetName(); // cannot be `name' because
// we don't manage this pointer.
p.second=u;
diff --git a/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx b/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
index 6ce14b25df0b9b05801f0f7b1e3c05f7c0311985..750075eeb5fff78946ad4bbdfe97babd6c3100bc 100644
--- a/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
@@ -1680,7 +1680,7 @@ const char* vtkXOpenGLRenderWindow::ReportCapabilities()
const char *glVersion = reinterpret_cast<const char *>(glGetString(GL_VERSION));
const char *glExtensions = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
- vtksys_ios::ostringstream strm;
+ std::ostringstream strm;
strm << "server glx vendor string: " << serverVendor << endl;
strm << "server glx version string: " << serverVersion << endl;
strm << "server glx extensions: " << serverExtensions << endl;
diff --git a/Rendering/OpenGL2/vtkCocoaRenderWindow.mm b/Rendering/OpenGL2/vtkCocoaRenderWindow.mm
index be7080762d820c8adb427fa560f0ffa331448889..b0cbb6acac6d2c59602a634f896427ddff02576f 100644
--- a/Rendering/OpenGL2/vtkCocoaRenderWindow.mm
+++ b/Rendering/OpenGL2/vtkCocoaRenderWindow.mm
@@ -416,7 +416,7 @@ const char* vtkCocoaRenderWindow::ReportCapabilities()
const char* glVersion = (const char*) glGetString(GL_VERSION);
const char* glExtensions = (const char*) glGetString(GL_EXTENSIONS);
- vtksys_ios::ostringstream strm;
+ std::ostringstream strm;
strm << "OpenGL vendor string: " << glVendor
<< "\nOpenGL renderer string: " << glRenderer
<< "\nOpenGL version string: " << glVersion
diff --git a/Rendering/OpenGL2/vtkIOSRenderWindow.mm b/Rendering/OpenGL2/vtkIOSRenderWindow.mm
index a91a146136e1006e11ff7d518033820309828b38..fbfae58e66c3f27013023ab5e75847491d56b245 100644
--- a/Rendering/OpenGL2/vtkIOSRenderWindow.mm
+++ b/Rendering/OpenGL2/vtkIOSRenderWindow.mm
@@ -198,7 +198,7 @@ const char* vtkIOSRenderWindow::ReportCapabilities()
const char* glVersion = (const char*) glGetString(GL_VERSION);
const char* glExtensions = (const char*) glGetString(GL_EXTENSIONS);
- vtksys_ios::ostringstream strm;
+ std::ostringstream strm;
strm << "OpenGL vendor string: " << glVendor
<< "\nOpenGL renderer string: " << glRenderer
<< "\nOpenGL version string: " << glVersion
diff --git a/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.cxx
index 57d9f1f5e869ed4056889853438d883b3788eb74..6fdd5b6a696c877aff6c0180b51ee4c158eed95a 100644
--- a/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.cxx
@@ -466,7 +466,7 @@ const char* vtkOSOpenGLRenderWindow::ReportCapabilities()
const char *glVersion = (const char *) glGetString(GL_VERSION);
const char *glExtensions = (const char *) glGetString(GL_EXTENSIONS);
- vtksys_ios::ostringstream strm;
+ std::ostringstream strm;
strm << "OpenGL vendor string: " << glVendor << endl;
strm << "OpenGL renderer string: " << glRenderer << endl;
strm << "OpenGL version string: " << glVersion << endl;
diff --git a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx
index f5f41635881cdf498c1294f038e91adeda33bb51..634078926ae2acc760519e6c9d07e82fdc871e40 100644
--- a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx
@@ -436,7 +436,7 @@ const char* vtkWin32OpenGLRenderWindow::ReportCapabilities()
const char *glRenderer = (const char *) glGetString(GL_RENDERER);
const char *glVersion = (const char *) glGetString(GL_VERSION);
- vtksys_ios::ostringstream strm;
+ std::ostringstream strm;
strm << "OpenGL vendor string: " << glVendor << endl;
strm << "OpenGL renderer string: " << glRenderer << endl;
strm << "OpenGL version string: " << glVersion << endl;
diff --git a/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx
index 5687638f2ac98f9cdf431c0607da81023730c752..879a7ceb71e5c378f3be559f6b7206e26e1e238e 100644
--- a/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx
@@ -1600,7 +1600,7 @@ const char* vtkXOpenGLRenderWindow::ReportCapabilities()
const char *glRenderer = reinterpret_cast<const char *>(glGetString(GL_RENDERER));
const char *glVersion = reinterpret_cast<const char *>(glGetString(GL_VERSION));
- vtksys_ios::ostringstream strm;
+ std::ostringstream strm;
strm << "server glx vendor string: " << serverVendor << endl;
strm << "server glx version string: " << serverVersion << endl;
strm << "server glx extensions: " << serverExtensions << endl;
diff --git a/Rendering/Parallel/vtkCompositeRGBAPass.cxx b/Rendering/Parallel/vtkCompositeRGBAPass.cxx
index 4344f358b5c57617c3f7e8834b6df4af351bcc16..42741b52220b742245317ce983090c08549c8c01 100644
--- a/Rendering/Parallel/vtkCompositeRGBAPass.cxx
+++ b/Rendering/Parallel/vtkCompositeRGBAPass.cxx
@@ -304,7 +304,7 @@ void vtkCompositeRGBAPass::Render(const vtkRenderState *s)
// rgbaToRgb->SetInputConnection(importer->GetOutputPort());
// rgbaToRgb->SetComponents(0,1,2);
- vtksys_ios::ostringstream ostxx;
+ std::ostringstream ostxx;
ostxx.setf(ios::fixed,ios::floatfield);
ostxx.precision(5);
timer->StopTimer();
@@ -506,7 +506,7 @@ void vtkCompositeRGBAPass::Render(const vtkRenderState *s)
// rgbaToRgb->SetInputConnection(importer->GetOutputPort());
// rgbaToRgb->SetComponents(0,1,2);
- vtksys_ios::ostringstream osty;
+ std::ostringstream osty;
osty.setf(ios::fixed,ios::floatfield);
osty.precision(5);
timer->StopTimer();
@@ -573,7 +573,7 @@ void vtkCompositeRGBAPass::Render(const vtkRenderState *s)
// rgbaToRgb->SetInputConnection(importer->GetOutputPort());
// rgbaToRgb->SetComponents(0,1,2);
- vtksys_ios::ostringstream ostxx;
+ std::ostringstream ostxx;
ostxx.setf(ios::fixed,ios::floatfield);
ostxx.precision(5);
timer->StopTimer();
diff --git a/Rendering/Parallel/vtkCompositeZPass.cxx b/Rendering/Parallel/vtkCompositeZPass.cxx
index 1a8e0706ef695db72e0af764f71ac5895ee24db2..14b2913400a544bc7bc6232ccc1611456ee9454e 100644
--- a/Rendering/Parallel/vtkCompositeZPass.cxx
+++ b/Rendering/Parallel/vtkCompositeZPass.cxx
@@ -289,7 +289,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
state->Update();
vtkIndent indent;
- vtksys_ios::ostringstream ost00;
+ std::ostringstream ost00;
ost00.setf(ios::fixed,ios::floatfield);
ost00.precision(5);
ost00 << "OpenGLState_" << pthread_self() << "_" << vtkTimerLog::GetUniversalTime() << "_root00.txt";
@@ -300,7 +300,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
this->PBO->Download2D(VTK_FLOAT,this->RawZBuffer,dims,1,continuousInc);
state->Update();
- vtksys_ios::ostringstream ost01;
+ std::ostringstream ost01;
ost01.setf(ios::fixed,ios::floatfield);
ost01.precision(5);
ost01 << "OpenGLState_" << pthread_self() << "_" << vtkTimerLog::GetUniversalTime() << "_root01.txt";
@@ -332,7 +332,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
// rgbaToRgb->SetInputConnection(importer->GetOutputPort());
// rgbaToRgb->SetComponents(0,1,2);
- vtksys_ios::ostringstream ostxx;
+ std::ostringstream ostxx;
ostxx.setf(ios::fixed,ios::floatfield);
ostxx.precision(5);
timer->StopTimer();
@@ -389,7 +389,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
// rgbaToRgb->SetComponents(0,1,2);
writer=vtkPNGWriter::New();
- vtksys_ios::ostringstream ost;
+ std::ostringstream ost;
timer->StopTimer();
ost.setf(ios::fixed,ios::floatfield);
ost.precision(5);
@@ -415,7 +415,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
#ifdef VTK_COMPOSITE_ZPASS_DEBUG
state->Update();
- vtksys_ios::ostringstream ost02;
+ std::ostringstream ost02;
ost02.setf(ios::fixed,ios::floatfield);
ost02.precision(5);
ost02 << "OpenGLState_" << pthread_self() << "_" << vtkTimerLog::GetUniversalTime() << "_root02_proc_" << proc <<"_"<<".txt";
@@ -428,7 +428,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
#ifdef VTK_COMPOSITE_ZPASS_DEBUG
state->Update();
- vtksys_ios::ostringstream ost03;
+ std::ostringstream ost03;
ost03.setf(ios::fixed,ios::floatfield);
ost03.precision(5);
ost03 << "OpenGLState_" << pthread_self() << "_" << vtkTimerLog::GetUniversalTime() << "_root03_proc_" << proc << "_"<<".txt";
@@ -489,7 +489,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
#ifdef VTK_COMPOSITE_ZPASS_DEBUG
state->Update();
- vtksys_ios::ostringstream ost04;
+ std::ostringstream ost04;
ost04.setf(ios::fixed,ios::floatfield);
ost04.precision(5);
ost04 << "OpenGLState_" << pthread_self() << "_" << vtkTimerLog::GetUniversalTime() << "_root_proc_" << proc << "_before_copyframe.txt";
@@ -512,7 +512,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
#ifdef VTK_COMPOSITE_ZPASS_DEBUG
state->Update();
- vtksys_ios::ostringstream ost05;
+ std::ostringstream ost05;
ost05.setf(ios::fixed,ios::floatfield);
ost05.precision(5);
ost05 << "OpenGLState_" << pthread_self() << "_" << vtkTimerLog::GetUniversalTime() << "_root_proc_" << proc << "_after_copyframe.txt";
@@ -532,7 +532,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
#ifdef VTK_COMPOSITE_ZPASS_DEBUG
state->Update();
- vtksys_ios::ostringstream ost06;
+ std::ostringstream ost06;
ost06.setf(ios::fixed,ios::floatfield);
ost06.precision(5);
ost06 << "OpenGLState_" << pthread_self() << "_" << vtkTimerLog::GetUniversalTime() << "_root_proc_" << proc << "_before_popattrib.txt";
@@ -547,7 +547,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
#ifdef VTK_COMPOSITE_ZPASS_DEBUG
state->Update();
- vtksys_ios::ostringstream ost07;
+ std::ostringstream ost07;
ost07.setf(ios::fixed,ios::floatfield);
ost07.precision(5);
ost07 << "OpenGLState_" << pthread_self() << "_" << vtkTimerLog::GetUniversalTime() << "_root_proc_" << proc << "_after_popattrib.txt";
@@ -595,7 +595,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
// rgbaToRgb->SetComponents(0,1,2);
- vtksys_ios::ostringstream ost3;
+ std::ostringstream ost3;
ost3.setf(ios::fixed,ios::floatfield);
ost3.precision(5);
@@ -671,7 +671,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
// rgbaToRgb->SetInputConnection(importer->GetOutputPort());
// rgbaToRgb->SetComponents(0,1,2);
- vtksys_ios::ostringstream ost;
+ std::ostringstream ost;
ost.setf(ios::fixed,ios::floatfield);
ost.precision(5);
timer->StopTimer();
@@ -723,7 +723,7 @@ void vtkCompositeZPass::Render(const vtkRenderState *s)
// rgbaToRgb->SetInputConnection(importer->GetOutputPort());
// rgbaToRgb->SetComponents(0,1,2);
- vtksys_ios::ostringstream ost2;
+ std::ostringstream ost2;
ost2.setf(ios::fixed,ios::floatfield);
ost2.precision(5);
timer->StopTimer();
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
index e5c8ef1ecf76bb6ae68362309e86b33d56b8d04a..1b53b002bf04d4c000c88bf28b26d44b944d737e 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
+++ b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
@@ -1517,7 +1517,7 @@ void vtkOpenGLGPUVolumeRayCastMapper::CheckFrameBufferStatus()
vtkStdString vtkOpenGLGPUVolumeRayCastMapper::BufferToString(int buffer)
{
vtkStdString result;
- vtksys_ios::ostringstream ost;
+ std::ostringstream ost;
GLint size;
@@ -2254,7 +2254,7 @@ void vtkOpenGLGPUVolumeRayCastMapper::LoadExtensions(
const char *glsl_version=
reinterpret_cast<const char *>(glGetString(vtkgl::SHADING_LANGUAGE_VERSION));
int glslMajor, glslMinor;
- vtksys_ios::istringstream ist(glsl_version);
+ std::istringstream ist(glsl_version);
ist >> glslMajor;
char c;
ist.get(c); // '.'
diff --git a/Views/Core/vtkConvertSelectionDomain.cxx b/Views/Core/vtkConvertSelectionDomain.cxx
index 7685c54276c9dd1df864ad75cd2adda61e9ad79b..699fd91525f56b4621ec01bbca7c94e8ca44de43 100644
--- a/Views/Core/vtkConvertSelectionDomain.cxx
+++ b/Views/Core/vtkConvertSelectionDomain.cxx
@@ -39,7 +39,7 @@
#include "vtkStringArray.h"
#include "vtkTable.h"
-#include <vtksys/stl/set>
+#include <set>
vtkStandardNewMacro(vtkConvertSelectionDomain);
//----------------------------------------------------------------------------
@@ -57,7 +57,7 @@ vtkConvertSelectionDomain::~vtkConvertSelectionDomain()
//----------------------------------------------------------------------------
static void vtkConvertSelectionDomainFindDomains(
vtkDataSetAttributes* dsa,
- vtksys_stl::set<vtkStdString> & domains)
+ std::set<vtkStdString> & domains)
{
if (dsa->GetAbstractArray("domain"))
{
@@ -86,8 +86,8 @@ static void vtkConvertSelectionDomainFindDomains(
static void vtkConvertSelectionDomainConvertAnnotationDomain(
vtkAnnotation* annIn,
vtkAnnotation* annOut,
- vtksys_stl::set<vtkStdString>& domains1,
- vtksys_stl::set<vtkStdString>& domains2,
+ std::set<vtkStdString>& domains1,
+ std::set<vtkStdString>& domains2,
vtkDataSetAttributes* dsa1,
vtkDataSetAttributes* dsa2,
int fieldType1, int fieldType2,
@@ -142,7 +142,7 @@ static void vtkConvertSelectionDomainConvertAnnotationDomain(
if (table)
{
fromArr = table->GetColumnByName(inArr->GetName());
- vtksys_stl::set<vtkStdString>::iterator it, itEnd;
+ std::set<vtkStdString>::iterator it, itEnd;
if (dsa1)
{
it = domains1.begin();
@@ -289,8 +289,8 @@ int vtkConvertSelectionDomain::RequestData(
fieldType1 = vtkSelectionNode::ROW;
}
- vtksys_stl::set<vtkStdString> domains1;
- vtksys_stl::set<vtkStdString> domains2;
+ std::set<vtkStdString> domains1;
+ std::set<vtkStdString> domains2;
if (dsa1)
{
vtkConvertSelectionDomainFindDomains(dsa1, domains1);
diff --git a/Views/Infovis/Testing/Cxx/TestCoincidentGraphLayoutView.cxx b/Views/Infovis/Testing/Cxx/TestCoincidentGraphLayoutView.cxx
index ffd2d2177e5a432031bc803225a370206f844685..e548026df31a041064ae0378c040030549c122b0 100644
--- a/Views/Infovis/Testing/Cxx/TestCoincidentGraphLayoutView.cxx
+++ b/Views/Infovis/Testing/Cxx/TestCoincidentGraphLayoutView.cxx
@@ -39,11 +39,11 @@
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
-#include <vtksys/ios/sstream>
+#include <sstream>
-template<typename T> vtksys_stl::string ToString(const T& x)
+template<typename T> std::string ToString(const T& x)
{
- vtksys_ios::ostringstream oss;
+ std::ostringstream oss;
oss << x;
return oss.str();
}
diff --git a/Views/Infovis/Testing/Cxx/TestInteractorStyleTreeMapHover.cxx b/Views/Infovis/Testing/Cxx/TestInteractorStyleTreeMapHover.cxx
index 72dd00a40c28960a985c2d3994b2dd8bf6e3452a..e95d94794cf274992532ab708baa7b2c5854b9b2 100644
--- a/Views/Infovis/Testing/Cxx/TestInteractorStyleTreeMapHover.cxx
+++ b/Views/Infovis/Testing/Cxx/TestInteractorStyleTreeMapHover.cxx
@@ -20,10 +20,6 @@
#include "vtkTreeMapLayout.h"
#include "vtkTreeMapToPolyData.h"
-#include <vtksys/stl/vector>
-
-using vtksys_stl::vector;
-
#define VTK_CREATE(type,name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
diff --git a/Views/Infovis/Testing/Cxx/TestRenderView.cxx b/Views/Infovis/Testing/Cxx/TestRenderView.cxx
index db24a1b33f7df7fb5d4ddc1a601f26d08fa73834..99657206a84cc2e26d16177f30390d5b9dba71e8 100644
--- a/Views/Infovis/Testing/Cxx/TestRenderView.cxx
+++ b/Views/Infovis/Testing/Cxx/TestRenderView.cxx
@@ -33,8 +33,7 @@
#include "vtkTransform.h"
#include "vtkTransformFilter.h"
-#include <vtksys/stl/vector>
-using vtksys_stl::vector;
+#include <vector>
#include "vtkSmartPointer.h"
#define VTK_CREATE(type, name) \
@@ -62,7 +61,7 @@ public:
private:
TestRenderViewUpdater() { }
~TestRenderViewUpdater() { }
- vector<vtkView*> Views;
+ std::vector<vtkView*> Views;
};
static char RenderViewEventLog[] =
diff --git a/Views/Infovis/vtkApplyIcons.cxx b/Views/Infovis/vtkApplyIcons.cxx
index 5b01f0e4a469ecd7c1b17d2eaa20cba9ec1dd6ac..db000db3d9d62b5e34e4f9f56a08905366df0c36 100644
--- a/Views/Infovis/vtkApplyIcons.cxx
+++ b/Views/Infovis/vtkApplyIcons.cxx
@@ -35,13 +35,13 @@
#include "vtkSmartPointer.h"
#include "vtkTable.h"
-#include <vtksys/stl/map>
+#include <map>
vtkStandardNewMacro(vtkApplyIcons);
class vtkApplyIcons::Internals {
public:
- vtksys_stl::map<vtkVariant, int> LookupTable;
+ std::map<vtkVariant, int> LookupTable;
};
vtkApplyIcons::vtkApplyIcons()
@@ -151,7 +151,7 @@ int vtkApplyIcons::RequestData(
if (this->UseLookupTable && arr)
{
// Map the data values through the lookup table.
- vtksys_stl::map<vtkVariant, int>::iterator itEnd = this->Implementation->LookupTable.end();
+ std::map<vtkVariant, int>::iterator itEnd = this->Implementation->LookupTable.end();
for (vtkIdType i = 0; i < iconArr->GetNumberOfTuples(); ++i)
{
vtkVariant val = arr->GetVariantValue(i);
diff --git a/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx b/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx
index fa3a50787a3eaaf17111b21c305f5650b87835b0..a8d336970d8d9251109fe1764e12007428e692e2 100644
--- a/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx
+++ b/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx
@@ -361,7 +361,7 @@ void vtkParallelCoordinatesRepresentation::UpdateHoverHighlight(vtkView* view,
if (x > 0 && y > 0)
{
- vtksys_ios::ostringstream str;
+ std::ostringstream str;
int* size = win->GetSize();
int linesFound = 0;
vtkCellArray* lines = this->PlotData->GetLines();
diff --git a/Views/Infovis/vtkRenderView.cxx b/Views/Infovis/vtkRenderView.cxx
index d86d5a9244a7c69a14829a6cfcd266d67a2f4d53..82f0cce7870a447a7d5b746eba9c67f5d8ca2c20 100644
--- a/Views/Infovis/vtkRenderView.cxx
+++ b/Views/Infovis/vtkRenderView.cxx
@@ -584,7 +584,7 @@ void vtkRenderView::UpdateHoverText()
}
// For debugging
- //vtksys_ios::ostringstream oss;
+ //std::ostringstream oss;
//oss << "prop: " << prop << " cell: " << cell;
//this->Balloon->SetBalloonText(oss.str().c_str());
//this->Balloon->StartWidgetInteraction(loc);
diff --git a/Views/Infovis/vtkRenderedGraphRepresentation.cxx b/Views/Infovis/vtkRenderedGraphRepresentation.cxx
index 16acc251a987e319f9735b4ccc3c0cfd7b109cc2..3a08912c6df417b850a21ed2e37e3fbff00c0a46 100644
--- a/Views/Infovis/vtkRenderedGraphRepresentation.cxx
+++ b/Views/Infovis/vtkRenderedGraphRepresentation.cxx
@@ -81,8 +81,7 @@
#include "vtkViewTheme.h"
#include <ctype.h>
-#include <vtksys/ios/sstream>
-#include <vtksys/stl/algorithm>
+#include <algorithm>
@@ -770,7 +769,7 @@ vtkGraphLayoutStrategy* vtkRenderedGraphRepresentation::GetLayoutStrategy()
void vtkRenderedGraphRepresentation::SetLayoutStrategy(const char* name)
{
std::string str = name;
- vtksys_stl::transform(str.begin(), str.end(), str.begin(), tolower);
+ std::transform(str.begin(), str.end(), str.begin(), tolower);
str.erase(std::remove(str.begin(), str.end(), ' '), str.end());
vtkSmartPointer<vtkGraphLayoutStrategy> strategy =
vtkSmartPointer<vtkPassThroughLayoutStrategy>::New();
diff --git a/Views/Infovis/vtkViewUpdater.cxx b/Views/Infovis/vtkViewUpdater.cxx
index 37b97fe9648df9bb21fa30d4446ea179d47499f4..ec18ef6dd78052240f1b06726904beabda6df5da 100644
--- a/Views/Infovis/vtkViewUpdater.cxx
+++ b/Views/Infovis/vtkViewUpdater.cxx
@@ -26,8 +26,8 @@
#include "vtkView.h"
#include "vtkRenderView.h"
-#include <vtksys/stl/vector>
-#include <vtksys/stl/algorithm>
+#include <vector>
+#include <algorithm>
vtkStandardNewMacro(vtkViewUpdater);
@@ -51,7 +51,7 @@ public:
}
}
- vtksys_stl::vector<vtkView*> Views;
+ std::vector<vtkView*> Views;
};
vtkViewUpdater::vtkViewUpdater()
@@ -71,12 +71,13 @@ void vtkViewUpdater::AddView(vtkView* view)
}
void vtkViewUpdater::RemoveView(vtkView* view)
{
- vtksys_stl::vector<vtkView*>::iterator p;
- p = vtksys_stl::find(this->Internals->Views.begin(), this->Internals->Views.end(), view);
+ std::vector<vtkView*>::iterator p;
+ p = std::find(this->Internals->Views.begin(), this->Internals->Views.end(), view);
if(p == this->Internals->Views.end())
return;
this->Internals->Views.erase(p);
}
+
void vtkViewUpdater::AddAnnotationLink(vtkAnnotationLink* link)
{
link->AddObserver(vtkCommand::AnnotationChangedEvent, this->Internals);
diff --git a/Web/Core/vtkWebUtilities.cxx b/Web/Core/vtkWebUtilities.cxx
index 43ff8ed3f3ab4b6b4b68ea9eac9493b11817e158..6d8180439dfffe6691781614955a704ee993ec5f 100644
--- a/Web/Core/vtkWebUtilities.cxx
+++ b/Web/Core/vtkWebUtilities.cxx
@@ -48,7 +48,7 @@ std::string vtkWebUtilities::WriteAttributesToJavaScript(
return "[]";
}
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
vtkNew<vtkDataSetAttributes> clone;
clone->PassData(dataset->GetAttributes(field_type));
@@ -82,7 +82,7 @@ std::string vtkWebUtilities::WriteAttributeHeadersToJavaScript(
return "[]";
}
- vtksys_ios::ostringstream stream;
+ std::ostringstream stream;
stream << "[";
vtkDataSetAttributes* dsa = dataset->GetAttributes(field_type);
diff --git a/Wrapping/PythonCore/PyVTKObject.cxx b/Wrapping/PythonCore/PyVTKObject.cxx
index 426d4bf4e9cdda7903d91fa6d84c332b3e3dc33e..dcf97357ba5df229cd402a62aa8a1c2f41209270 100644
--- a/Wrapping/PythonCore/PyVTKObject.cxx
+++ b/Wrapping/PythonCore/PyVTKObject.cxx
@@ -51,7 +51,7 @@ static PyObject *PyVTKObject_String(PyObject *op)
}
PyErr_Clear();
- vtksys_ios::ostringstream vtkmsg_with_warning_C4701;
+ std::ostringstream vtkmsg_with_warning_C4701;
((PyVTKObject *)op)->vtk_ptr->Print(vtkmsg_with_warning_C4701);
vtkmsg_with_warning_C4701.put('\0');
PyObject *res = PyString_FromString(vtkmsg_with_warning_C4701.str().c_str());
diff --git a/Wrapping/Tools/vtkWrapJava.c b/Wrapping/Tools/vtkWrapJava.c
index 870050043fb42edbd23fb1e35915eda24449ab7c..6f763b21eb6c8a8f36156397151fb7da879f650e 100644
--- a/Wrapping/Tools/vtkWrapJava.c
+++ b/Wrapping/Tools/vtkWrapJava.c
@@ -1419,7 +1419,7 @@ int main(int argc, char *argv[])
fprintf(fp," jstring tmp;\n\n");
fprintf(fp," op = (vtkObjectBase *)vtkJavaGetPointerFromObject(env,obj);\n");
- fprintf(fp," vtksys_ios::ostringstream vtkmsg_with_warning_C4701;\n");
+ fprintf(fp," std::ostringstream vtkmsg_with_warning_C4701;\n");
fprintf(fp," op->Print(vtkmsg_with_warning_C4701);\n");
fprintf(fp," vtkmsg_with_warning_C4701.put('\\0');\n");
fprintf(fp," tmp = vtkJavaMakeJavaString(env,vtkmsg_with_warning_C4701.str().c_str());\n");
@@ -1434,7 +1434,7 @@ int main(int argc, char *argv[])
fprintf(fp," jstring tmp;\n\n");
fprintf(fp," op = (vtkObjectBase *)vtkJavaGetPointerFromObject(env,obj);\n");
- fprintf(fp," vtksys_ios::ostringstream vtkmsg_with_warning_C4701;\n");
+ fprintf(fp," std::ostringstream vtkmsg_with_warning_C4701;\n");
fprintf(fp," op->PrintRevisions(vtkmsg_with_warning_C4701);\n");
fprintf(fp," vtkmsg_with_warning_C4701.put('\\0');\n");
fprintf(fp," tmp = vtkJavaMakeJavaString(env,vtkmsg_with_warning_C4701.str().c_str());\n");
diff --git a/Wrapping/Tools/vtkWrapPythonMethodDef.c b/Wrapping/Tools/vtkWrapPythonMethodDef.c
index 84726b67a32119f4d50b5aabcaf571d4970c4a98..8e21424ba0ac949bcbf2df4a58d6083d452dadbb 100644
--- a/Wrapping/Tools/vtkWrapPythonMethodDef.c
+++ b/Wrapping/Tools/vtkWrapPythonMethodDef.c
@@ -787,7 +787,7 @@ static void vtkWrapPython_CustomMethods(
"\n"
" if (op && ap.CheckArgCount(0))\n"
" {\n"
- " vtksys_ios::ostringstream vtkmsg_with_warning_C4701;\n"
+ " std::ostringstream vtkmsg_with_warning_C4701;\n"
" op->PrintRevisions(vtkmsg_with_warning_C4701);\n"
" vtkmsg_with_warning_C4701.put('\\0');\n"
" tempr = vtkmsg_with_warning_C4701.str().c_str();\n"
diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c
index 62d80d032da295a329097aeb04ec04d3e61dd5e0..6f7a9f6ce6cabf03902396aea3a9fb628e41272c 100644
--- a/Wrapping/Tools/vtkWrapPythonType.c
+++ b/Wrapping/Tools/vtkWrapPythonType.c
@@ -141,12 +141,12 @@ static void vtkWrapPython_PrintProtocol(
"static PyObject *Py%s_String(PyObject *self)\n"
"{\n"
" PyVTKSpecialObject *obj = (PyVTKSpecialObject *)self;\n"
- " vtksys_ios::ostringstream os;\n"
+ " std::ostringstream os;\n"
" if (obj->vtk_ptr)\n"
" {\n"
" os << *static_cast<const %s *>(obj->vtk_ptr);\n"
" }\n"
- " const vtksys_stl::string &s = os.str();\n"
+ " const std::string &s = os.str();\n"
" return PyString_FromStringAndSize(s.data(), s.size());\n"
"}\n"
"\n",
diff --git a/Wrapping/Tools/vtkWrapTcl.c b/Wrapping/Tools/vtkWrapTcl.c
index cea69a562ec0790281c227ef51245f326ca9fada..3409384b6ddabed78ce4747d4dcacd9eaa56b3fd 100644
--- a/Wrapping/Tools/vtkWrapTcl.c
+++ b/Wrapping/Tools/vtkWrapTcl.c
@@ -1541,7 +1541,7 @@ int main(int argc, char *argv[])
if (!strcmp("vtkObjectBase",data->Name))
{
fprintf(fp," if ((!strcmp(\"Print\",argv[1]))&&(argc == 2))\n {\n");
- fprintf(fp," vtksys_ios::ostringstream buf_with_warning_C4701;\n");
+ fprintf(fp," std::ostringstream buf_with_warning_C4701;\n");
fprintf(fp," op->Print(buf_with_warning_C4701);\n");
fprintf(fp," buf_with_warning_C4701.put('\\0');\n");
fprintf(fp," Tcl_SetResult(interp,const_cast<char *>(buf_with_warning_C4701.str().c_str()),\n");
@@ -1550,7 +1550,7 @@ int main(int argc, char *argv[])
#ifndef VTK_LEGACY_REMOVE
/* Add the PrintRevisions method to vtkObjectBase. */
fprintf(fp," if ((!strcmp(\"PrintRevisions\",argv[1]))&&(argc == 2))\n {\n");
- fprintf(fp," vtksys_ios::ostringstream buf_with_warning_C4701;\n");
+ fprintf(fp," std::ostringstream buf_with_warning_C4701;\n");
fprintf(fp," op->PrintRevisions(buf_with_warning_C4701);\n");
fprintf(fp," buf_with_warning_C4701.put('\\0');\n");
fprintf(fp," Tcl_SetResult(interp,const_cast<char *>(buf_with_warning_C4701.str().c_str()),\n");