From: rnv <rnv@opencascade.com>
Date: Sat, 20 Feb 2016 12:17:33 +0000 (+0300)
Subject: Using std::vector instead of removed vtksys_stl::vector
X-Git-Tag: V8_0_0rc2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f6eb723ac114ad229668b6bd094737651b1cb9d9;p=modules%2Fparavis.git

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

diff --git a/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx b/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx
index fc44ae02..592aa1bf 100644
--- 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 c3a4108c..43ef28e6 100644
--- 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 16753fec..25417e77 100644
--- 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 bba82eab..2df0e7d5 100644
--- 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.