suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build failure with more recent OCC versions that dropped PI

Browse Source
This commit is contained in:
wmayer 2013-04-02 18:06:24 +02:00
parent 60d25231ca
commit d806556225
6 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp vendored
View File

@ -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 <cmath>
#include "SMESH_ControlsDef.hxx"
#include <set>
@ -40,7 +45,6 @@
#include <Geom_Surface.hxx>
#include <Precision.hxx>
#include <Standard_Real.hxx>
#include <TColStd_MapIteratorOfMapOfInteger.hxx>
#include <TColStd_MapOfInteger.hxx>
#include <TColStd_SequenceOfAsciiString.hxx>
@ -65,6 +69,10 @@
#include "SMESHDS_Mesh.hxx"
#include "SMESHDS_GroupBase.hxx"
#ifndef PI
#define PI M_PI
#endif
/*
AUXILIARY METHODS
*/

10
src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp vendored
View File

@ -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 <cmath>
#include "SMESH_MeshEditor.hxx"
#include "SMDS_FaceOfNodes.hxx"
@ -54,7 +59,6 @@
#include <GeomAdaptor_Surface.hxx>
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
#include <Standard_Real.hxx>
#include <Standard_Version.hxx>
#include <TColStd_ListOfInteger.hxx>
#include <TopExp.hxx>
@ -77,6 +81,10 @@
#include <map>
#include <set>
#ifndef PI
#define PI M_PI
#endif
#define cast2Node(elem) static_cast<const SMDS_MeshNode*>( elem )
using namespace std;

10
src/3rdParty/salomesmesh/src/SMESH/SMESH_Pattern.cpp vendored
View File

@ -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 <cmath>
#include "SMESH_Pattern.hxx"
#include <BRepAdaptor_Curve.hxx>
@ -39,7 +44,6 @@
#include <GeomAdaptor_Surface.hxx>
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
#include <Standard_Real.hxx>
#include <Standard_Version.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <TopExp.hxx>
@ -76,6 +80,10 @@
#include "utilities.h"
#ifndef PI
#define PI M_PI
#endif
using namespace std;
typedef map< const SMDS_MeshElement*, int > TNodePointIDMap;

10
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp vendored
View File

@ -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 <cmath>
#include "StdMeshers_AutomaticLength.hxx"
#include "SMESH_Mesh.hxx"
@ -34,12 +39,15 @@
#include "utilities.h"
#include <Standard_Real.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopExp.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Edge.hxx>
#ifndef PI
#define PI M_PI
#endif
using namespace std;
//=============================================================================

9
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp vendored
View File

@ -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 <cmath>
#include "StdMeshers_CompositeHexa_3D.hxx"
@ -40,7 +44,6 @@
#include <BRep_Tool.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_Failure.hxx>
#include <Standard_Real.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_MapIteratorOfMapOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
@ -57,6 +60,10 @@
#include <set>
#include <vector>
#ifndef PI
#define PI M_PI
#endif
#ifdef _DEBUG_

10
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp vendored
View File

@ -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 <cmath>
#include "StdMeshers_QuadToTriaAdaptor.hxx"
#include <SMDS_FaceOfNodes.hxx>
@ -33,7 +38,6 @@
#include <IntAna_IntConicQuad.hxx>
#include <IntAna_Quadric.hxx>
#include <Standard_Real.hxx>
#include <TColStd_SequenceOfInteger.hxx>
#include <TColgp_HSequenceOfPnt.hxx>
#include <TopExp_Explorer.hxx>
@ -41,6 +45,10 @@
#include <gp_Lin.hxx>
#include <gp_Pln.hxx>
#ifndef PI
#define PI M_PI
#endif
#ifndef __BORLANDC__
#include <NCollection_Array1.hxx>
typedef NCollection_Array1<TColStd_SequenceOfInteger> StdMeshers_Array1OfSequenceOfInteger;