diff --git a/src/MEFISTO2/Rn.h b/src/MEFISTO2/Rn.h index cae413d78..f832ad918 100644 --- 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 e20d578ce..87eaf832f 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -44,6 +44,7 @@ #include #include #include +#include #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 e2a4a99b6..4771c6da8 100644 --- 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 93559ab36..7be8cb7ef 100644 --- 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 8de8c92d2..e8d9eaea6 100644 --- 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(load >> _begLength);