From 78b20eb93872336c8d925211ca57bfa3faf61f71 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 23 Jan 2008 09:16:07 +0000
Subject: [PATCH] fix M_PI problem with msvc
---
Mesh/BDS.h | 2 +-
Plugin/HarmonicToTime.cpp | 3 +--
Plugin/SphericalRaise.cpp | 3 +--
Plugin/TransformLatLon.cpp | 3 +--
variables.msvc | 2 +-
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Mesh/BDS.h b/Mesh/BDS.h
index dfcd57d9cd..fe54c7f853 100644
--- a/Mesh/BDS.h
+++ b/Mesh/BDS.h
@@ -148,7 +148,7 @@ public:
}
double angle_deg(const BDS_Vector &v) const
{
- return angle(v) * 180. / 3.1415926535897932;
+ return angle(v) * 180. / M_PI;
}
double operator * (const BDS_Vector &v) const
{
diff --git a/Plugin/HarmonicToTime.cpp b/Plugin/HarmonicToTime.cpp
index 653c520ea1..d7af0924c8 100644
--- a/Plugin/HarmonicToTime.cpp
+++ b/Plugin/HarmonicToTime.cpp
@@ -1,4 +1,4 @@
-// $Id: HarmonicToTime.cpp,v 1.13 2008-01-22 20:44:36 geuzaine Exp $
+// $Id: HarmonicToTime.cpp,v 1.14 2008-01-23 09:16:07 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -20,7 +20,6 @@
// Please report all bugs and problems to <gmsh@geuz.org>.
#include "HarmonicToTime.h"
-#include "Numeric.h"
StringXNumber HarmonicToTimeOptions_Number[] = {
{GMSH_FULLRC, "RealPart", NULL, 0.},
diff --git a/Plugin/SphericalRaise.cpp b/Plugin/SphericalRaise.cpp
index 3cab827193..2ab23214a1 100644
--- a/Plugin/SphericalRaise.cpp
+++ b/Plugin/SphericalRaise.cpp
@@ -1,4 +1,4 @@
-// $Id: SphericalRaise.cpp,v 1.28 2008-01-20 12:21:30 geuzaine Exp $
+// $Id: SphericalRaise.cpp,v 1.29 2008-01-23 09:16:07 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -20,7 +20,6 @@
// Please report all bugs and problems to <gmsh@geuz.org>.
#include "SphericalRaise.h"
-#include "Numeric.h"
StringXNumber SphericalRaiseOptions_Number[] = {
{GMSH_FULLRC, "Xc", NULL, 0.},
diff --git a/Plugin/TransformLatLon.cpp b/Plugin/TransformLatLon.cpp
index ced9c5bdb3..c9b28b02c2 100644
--- a/Plugin/TransformLatLon.cpp
+++ b/Plugin/TransformLatLon.cpp
@@ -1,4 +1,4 @@
-// $Id: TransformLatLon.cpp,v 1.2 2008-01-22 20:44:36 geuzaine Exp $
+// $Id: TransformLatLon.cpp,v 1.3 2008-01-23 09:16:07 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -20,7 +20,6 @@
// Please report all bugs and problems to <gmsh@geuz.org>.
#include "TransformLatLon.h"
-#include "Numeric.h"
StringXNumber TransformLatLonOptions_Number[] = {
{GMSH_FULLRC,(char*) "iView", NULL, -1.},
diff --git a/variables.msvc b/variables.msvc
index fa53ab0aba..1ef9702b18 100644
--- a/variables.msvc
+++ b/variables.msvc
@@ -15,7 +15,7 @@ CXX=cl /EHsc /nologo
LINKER=cl /F16777216
# All compiler flags except optimization flags
-FLAGS=/DWIN32 /DHAVE_NO_DLL /DHAVE_NO_VSNPRINTF /DHAVE_NO_SNPRINTF /DHAVE_NO_SOCKLEN_T /DHAVE_ANN /DHAVE_MATH_EVAL /DHAVE_NETGEN /DHAVE_TETGEN /DHAVE_TRIANGLE
+FLAGS=/DWIN32 /D_USE_MATH_DEFINES /DHAVE_NO_DLL /DHAVE_NO_VSNPRINTF /DHAVE_NO_SNPRINTF /DHAVE_NO_SOCKLEN_T /DHAVE_ANN /DHAVE_MATH_EVAL /DHAVE_NETGEN /DHAVE_TETGEN /DHAVE_TRIANGLE
# Additional system includes
SYSINCLUDE=/I"C:\Program Files\Microsoft Visual Studio 9.0\VC\INCLUDE" /I"C:\Program Files\Microsoft SDKs\Windows\v6.0A\include"
--
GitLab