ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-12 01:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors (OCCT-7.4.0)

Browse Source
This commit is contained in:
rnv 2019-12-17 22:19:00 +03:00
parent b311e0ddf7
commit 70d591791d
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MEFISTO2/Rn.h
View File

@ -180,12 +180,12 @@ class R4: public R3
{ {
friend std::ostream& operator <<(std::ostream& f, const R4 & P ) friend std::ostream& operator <<(std::ostream& f, const R4 & P )
{ f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; } { 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; } { f >> P.x >> P.y >> P.z >> P.omega ; return f; }
friend std::ostream& operator <<(std::ostream& f, const R4 * P ) friend std::ostream& operator <<(std::ostream& f, const R4 * P )
{ f << P->x << ' ' << P->y << ' ' << P->z << ' ' << P->omega; return f; } { 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; } { f >> P->x >> P->y >> P->z >> P->omega ; return f; }
public: public:

3
src/SMESH/SMESH_Mesh.hxx
View File

@ -44,6 +44,7 @@
#include <map> #include <map>
#include <list> #include <list>
#include <vector> #include <vector>
#include <ostream>
#ifdef WIN32 #ifdef WIN32
#pragma warning(disable:4251) // Warning DLL Interface ... #pragma warning(disable:4251) // Warning DLL Interface ...
@ -357,7 +358,7 @@ class SMESH_EXPORT SMESH_Mesh
bool IsOrderOK( const SMESH_subMesh* smBefore, bool IsOrderOK( const SMESH_subMesh* smBefore,
const SMESH_subMesh* smAfter ) const; const SMESH_subMesh* smAfter ) const;
std::ostream& Dump(ostream & save); std::ostream& Dump(std::ostream & save);
private: private:

2
src/SMESHUtils/SMESH_Delaunay.cxx
View File

@ -388,5 +388,5 @@ void SMESH_Delaunay::ToPython() const
file.remove(); file.remove();
file.openForWriting(); file.openForWriting();
file.write( text.c_str(), text.size() ); file.write( text.c_str(), text.size() );
cout << "exec(open('" << fileName << "', 'rb').read())"; std::cout << "exec(open('" << fileName << "', 'rb').read())";
} }

2
src/SMESH_I/SMESH_PythonDump.cxx
View File

@ -668,7 +668,7 @@ namespace SMESH
void printException( const char* text ) void printException( const char* text )
{ {
#ifdef _DEBUG_ #ifdef _DEBUG_
cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << endl; std::cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << std::endl;
#endif #endif
} }

4
src/StdMeshers/StdMeshers_Geometric1D.cxx
View File

@ -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 << " "; 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; bool isOK = true;
isOK = static_cast<bool>(load >> _begLength); isOK = static_cast<bool>(load >> _begLength);