Using std::vector instead of removed vtksys_stl::vector

diff --git a/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx b/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx
index fc44ae0225ed1f105b4a5480a6d1fa56c308f03d..592aa1bf6edccab8de0d653570834a5929a49ce4 100644 (file)
--- a/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx
+++ b/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx
@@ -35,6 +35,7 @@
 #include "GEOM_Client.hxx"
 #include "OCC2VTK_Tools.h"
 
+#include <algorithm>
 
 //----------------------------------------------
 vtkStandardNewMacro(vtkParaGEOMCorbaSource);
@@ -72,7 +73,7 @@ void vtkParaGEOMCorbaSource::SetIORCorba(char *ior) {
     return;
   int length=strlen(ior);
   IOR.resize(length+1);
-  vtksys_stl::copy(ior,ior+length+1,&IOR[0]);
+  std::copy(ior,ior+length+1,&IOR[0]);
   this->Modified();
 }
 

diff --git a/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.h b/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.h
index c3a4108c0253434b77349bfba3beb334b6e7fb6e..43ef28e6d41625bbed60947866f02fa92464b485 100644 (file)
--- a/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.h
+++ b/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.h
@@ -22,7 +22,7 @@
 #define __vtkParaGEOMCorbaSource_h
 
 #include "vtkUnstructuredGridAlgorithm.h"
-#include <vtksys/stl/vector>
+#include <vector>
 
 class vtkParaGEOMCorbaSource : public vtkAlgorithm {
  public:
@@ -41,7 +41,7 @@ class vtkParaGEOMCorbaSource : public vtkAlgorithm {
   int ProcessRequest(vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector);
   virtual int RequestData( vtkInformation* request, vtkInformationVector** inInfo, vtkInformationVector* outInfo );
 
-  vtksys_stl::vector<char> IOR;
+  std::vector<char> IOR;
   static void *Orb;
   double Deflection;
   

diff --git a/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx b/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx
index 16753fec2ef8d164a14395558c862e8ce5fdbef9..25417e770c1dc1d813a0f7ecc726dbf0f31c42b1 100644 (file)
--- a/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx
+++ b/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx
@@ -32,6 +32,8 @@
 #include "SMDS_UnstructuredGrid.hxx"
 #include "SMESH_Mesh.hh"
 
+#include <algorithm>
+
 vtkStandardNewMacro(vtkParaSMESHCorbaSource);
 
 void *vtkParaSMESHCorbaSource::Orb=0;
@@ -67,7 +69,7 @@ void vtkParaSMESHCorbaSource::SetIORCorba(char *ior) {
     return;
   int length=strlen(ior);
   IOR.resize(length+1);
-  vtksys_stl::copy(ior,ior+length+1,&IOR[0]);
+  std::copy(ior,ior+length+1,&IOR[0]);
   this->Modified();
 }
 

diff --git a/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.h b/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.h
index bba82eab3802bb06ff46befe728fe1e60124c5ab..2df0e7d505767359f1a49260afcb08f27c9940de 100644 (file)
--- a/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.h
+++ b/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.h
@@ -22,7 +22,7 @@
 #define __vtkParaSMESHCorbaSource_h
 
 #include "vtkUnstructuredGridAlgorithm.h"
-#include <vtksys/stl/vector>
+#include <vector>
 
 class vtkParaSMESHCorbaSource: public vtkAlgorithm {
  public:
@@ -39,7 +39,7 @@ protected:
   int FillOutputPortInformation(int vtkNotUsed(port), vtkInformation* info);
   int ProcessRequest(vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector);
   virtual int RequestData( vtkInformation* request, vtkInformationVector** inInfo, vtkInformationVector* outInfo );
-  vtksys_stl::vector<char> IOR;
+  std::vector<char> IOR;
   static void *Orb;
  private:
   vtkParaSMESHCorbaSource( const vtkParaSMESHCorbaSource& ); // Not implemented.