From 943d24cfa1118512d3b96011b182528172d77045 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 15 Jun 2012 18:33:05 +0200
Subject: [PATCH] Fix OCC6.5.3 build errors

---
 src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp     | 5 +++++
 src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp      | 4 ++++
 src/3rdParty/salomesmesh/src/SMESH/SMESH_Pattern.cpp         | 5 +++++
 .../src/StdMeshers/StdMeshers_AutomaticLength.cpp            | 5 +++++
 .../src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp           | 5 +++++
 .../src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp          | 5 +++++
 .../src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp      | 5 +++++
 7 files changed, 34 insertions(+)

diff --git a/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp b/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp
index d03237fd4..bba92104e 100644
--- a/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp
+++ b/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp
@@ -63,6 +63,11 @@
 
 #include "SMESHDS_Mesh.hxx"
 #include "SMESHDS_GroupBase.hxx"
+#include <cmath>
+
+#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 2d81e9a47..c0bb7e0f1 100644
--- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
+++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
@@ -82,6 +82,10 @@
 #include <numeric>
 #include <limits>
 
+#ifndef PI
+#define PI M_PI
+#endif
+
 #define cast2Node(elem) static_cast<const SMDS_MeshNode*>( 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 5c090d632..135e24d64 100644
--- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_Pattern.cpp
+++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_Pattern.cpp
@@ -74,6 +74,11 @@
 #include "SMESH_subMesh.hxx"
 
 #include "utilities.h"
+#include <cmath>
+
+#ifndef PI
+#define PI M_PI
+#endif
 
 using namespace std;
 
diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp
index 95710c94e..d77560e0e 100644
--- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp
+++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp
@@ -37,6 +37,11 @@
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
+#include <cmath>
+
+#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 953081fb3..b294f8aa5 100644
--- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp
+++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp
@@ -56,6 +56,11 @@
 #include <list>
 #include <set>
 #include <vector>
+#include <cmath>
+
+#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 f3e0517d5..50eef649d 100644
--- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp
+++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp
@@ -47,6 +47,11 @@ typedef NCollection_Array1<TColStd_SequenceOfInteger> StdMeshers_Array1OfSequenc
 #include <SMESH_Array1.hxx>
 typedef SMESH_Array1<TColStd_SequenceOfInteger> StdMeshers_Array1OfSequenceOfInteger;
 #endif
+#include <cmath>
+
+#ifndef PI
+#define PI M_PI
+#endif
 
 //=======================================================================
 //function : StdMeshers_QuadToTriaAdaptor
diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp
index 8d21195db..0ce2382e1 100644
--- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp
+++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp
@@ -54,6 +54,11 @@
 #include <TColgp_SequenceOfPnt2d.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
+#include <cmath>
+
+#ifndef PI
+#define PI M_PI
+#endif
 
 
 using namespace std;