diff --git a/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp b/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp index 2fa9a8e98..742dbbf8f 100644 --- a/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp +++ b/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp @@ -19,6 +19,11 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#endif // _MSC_VER +#include + #include "SMESH_ControlsDef.hxx" #include @@ -40,7 +45,6 @@ #include #include -#include #include #include #include @@ -65,6 +69,10 @@ #include "SMESHDS_Mesh.hxx" #include "SMESHDS_GroupBase.hxx" +#ifndef PI +#define PI M_PI +#endif + /* AUXILIARY METHODS */ diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp index 070dfe2a7..ad5fd5a27 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp @@ -24,6 +24,11 @@ // Created : Mon Apr 12 16:10:22 2004 // Author : Edward AGAPOV (eap) // +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#endif // _MSC_VER +#include + #include "SMESH_MeshEditor.hxx" #include "SMDS_FaceOfNodes.hxx" @@ -54,7 +59,6 @@ #include #include #include -#include #include #include #include @@ -77,6 +81,10 @@ #include #include +#ifndef PI +#define PI M_PI +#endif + #define cast2Node(elem) static_cast( elem ) using namespace std; diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_Pattern.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_Pattern.cpp index 575d8420a..aa02c183b 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_Pattern.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_Pattern.cpp @@ -23,6 +23,11 @@ // Created : Mon Aug 2 10:30:00 2004 // Author : Edward AGAPOV (eap) // +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#endif // _MSC_VER +#include + #include "SMESH_Pattern.hxx" #include @@ -39,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -76,6 +80,10 @@ #include "utilities.h" +#ifndef PI +#define PI M_PI +#endif + using namespace std; typedef map< const SMDS_MeshElement*, int > TNodePointIDMap; diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp index 02bc465c3..75eaf24aa 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp @@ -25,6 +25,11 @@ // Module : SMESH // $Header: /home/server/cvs/SMESH/SMESH_SRC/src/StdMeshers/StdMeshers_AutomaticLength.cxx,v 1.7.2.1 2008/11/27 13:03:50 abd Exp $ // +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#endif // _MSC_VER +#include + #include "StdMeshers_AutomaticLength.hxx" #include "SMESH_Mesh.hxx" @@ -34,12 +39,15 @@ #include "utilities.h" -#include #include #include #include #include +#ifndef PI +#define PI M_PI +#endif + using namespace std; //============================================================================= diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp index ed68c1182..04ac9e7be 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp @@ -23,6 +23,10 @@ // Module : SMESH // Created : Tue Nov 25 11:04:59 2008 // Author : Edward AGAPOV (eap) +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#endif // _MSC_VER +#include #include "StdMeshers_CompositeHexa_3D.hxx" @@ -40,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -57,6 +60,10 @@ #include #include +#ifndef PI +#define PI M_PI +#endif + #ifdef _DEBUG_ diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp index 4a60650ee..3ce1d9a73 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp @@ -25,6 +25,11 @@ // Created : Wen May 07 16:37:07 2008 // Author : Sergey KUUL (skl) // +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#endif // _MSC_VER +#include + #include "StdMeshers_QuadToTriaAdaptor.hxx" #include @@ -33,7 +38,6 @@ #include #include -#include #include #include #include @@ -41,6 +45,10 @@ #include #include +#ifndef PI +#define PI M_PI +#endif + #ifndef __BORLANDC__ #include typedef NCollection_Array1 StdMeshers_Array1OfSequenceOfInteger;