Fix compilation errors (OCCT-7.4.0)

diff --git a/src/MEFISTO2/Rn.h b/src/MEFISTO2/Rn.h
index cae413d78e1b2cb5f488a03d05e2c6e080a8f7f6..f832ad9183e51a4b5845cf73cc8bec2d755f53fa 100644 (file)
--- a/src/MEFISTO2/Rn.h
+++ b/src/MEFISTO2/Rn.h
@@ -180,12 +180,12 @@ class R4: public R3
 {
   friend std::ostream& operator <<(std::ostream& f, const R4 & P )
   { f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; }
-  friend istream& operator >>(istream& f,  R4 & P)
+  friend std::istream& operator >>(std::istream& f,  R4 & P)
   { f >> P.x >>  P.y >>  P.z >> P.omega ; return f; }
 
   friend std::ostream& operator <<(std::ostream& f, const R4 * P )
   { f << P->x << ' ' << P->y << ' ' << P->z << ' ' << P->omega; return f; }
-  friend istream& operator >>(istream& f,  R4 * P)
+  friend std::istream& operator >>(std::istream& f,  R4 * P)
   { f >> P->x >>  P->y >>  P->z >> P->omega ; return f; }
 
 public:  

diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index e20d578ce387abd36805185c5945bfecf2f99594..87eaf832fb0d0251ba3292872797bfa92d11a1aa 100644 (file)
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -44,6 +44,7 @@
 #include <map>
 #include <list>
 #include <vector>
+#include <ostream>
 
 #ifdef WIN32
 #pragma warning(disable:4251) // Warning DLL Interface ...
@@ -357,7 +358,7 @@ class SMESH_EXPORT SMESH_Mesh
   bool IsOrderOK( const SMESH_subMesh* smBefore,
                   const SMESH_subMesh* smAfter ) const;
 
-  std::ostream& Dump(ostream & save);
+  std::ostream& Dump(std::ostream & save);
   
 private:
 

diff --git a/src/SMESHUtils/SMESH_Delaunay.cxx b/src/SMESHUtils/SMESH_Delaunay.cxx
index e2a4a99b6eedbddc9f205e4b2823178d1ee8d421..4771c6da890a3fd79abe7e32eb71e2b409b8cae3 100644 (file)
--- a/src/SMESHUtils/SMESH_Delaunay.cxx
+++ b/src/SMESHUtils/SMESH_Delaunay.cxx
@@ -388,5 +388,5 @@ void SMESH_Delaunay::ToPython() const
   file.remove();
   file.openForWriting();
   file.write( text.c_str(), text.size() );
-  cout << "exec(open('" << fileName << "', 'rb').read())";
+  std::cout << "exec(open('" << fileName << "', 'rb').read())";
 }

diff --git a/src/SMESH_I/SMESH_PythonDump.cxx b/src/SMESH_I/SMESH_PythonDump.cxx
index 93559ab3643b1e61b90ed4eced321dcfb5ec6102..7be8cb7ef69616f74e2f3b1e4bb7c395c5b6edbb 100644 (file)
--- a/src/SMESH_I/SMESH_PythonDump.cxx
+++ b/src/SMESH_I/SMESH_PythonDump.cxx
@@ -668,7 +668,7 @@ namespace SMESH
   void printException( const char* text )
   {
 #ifdef _DEBUG_
-    cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << endl;
+    std::cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << std::endl;
 #endif
   }
 

diff --git a/src/StdMeshers/StdMeshers_Geometric1D.cxx b/src/StdMeshers/StdMeshers_Geometric1D.cxx
index 8de8c92d21bd4f21daebf27372a4a2051febe0af..e8d9eaea6f3ccfd79e91295471e8de35cf941aca 100644 (file)
--- a/src/StdMeshers/StdMeshers_Geometric1D.cxx
+++ b/src/StdMeshers/StdMeshers_Geometric1D.cxx
@@ -114,7 +114,7 @@ double StdMeshers_Geometric1D::GetCommonRatio() const
  */
 //=============================================================================
 
-ostream & StdMeshers_Geometric1D::SaveTo(ostream & save)
+std::ostream & StdMeshers_Geometric1D::SaveTo(std::ostream & save)
 {
   save << _begLength << " " << _ratio << " ";
 
@@ -129,7 +129,7 @@ ostream & StdMeshers_Geometric1D::SaveTo(ostream & save)
  */
 //=============================================================================
 
-istream & StdMeshers_Geometric1D::LoadFrom(istream & load)
+std::istream & StdMeshers_Geometric1D::LoadFrom(std::istream & load)
 {
   bool isOK = true;
   isOK = static_cast<bool>(load >> _begLength);