From 04c5114db75d6c5be897a75e3b9fae31b48c3738 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 22 Jan 2008 20:44:36 +0000
Subject: [PATCH] fix msvc compile
---
Mesh/BDS.h | 2 +-
Plugin/CutParametric.cpp | 4 ++--
Plugin/HarmonicToTime.cpp | 3 ++-
Plugin/TransformLatLon.cpp | 3 ++-
contrib/Netgen/Makefile | 4 ++--
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Mesh/BDS.h b/Mesh/BDS.h
index ac91602a1a..dfcd57d9cd 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 / M_PI;
+ return angle(v) * 180. / 3.1415926535897932;
}
double operator * (const BDS_Vector &v) const
{
diff --git a/Plugin/CutParametric.cpp b/Plugin/CutParametric.cpp
index 84be40e861..58f13d53d7 100644
--- a/Plugin/CutParametric.cpp
+++ b/Plugin/CutParametric.cpp
@@ -1,4 +1,4 @@
-// $Id: CutParametric.cpp,v 1.22 2007-09-11 14:01:54 geuzaine Exp $
+// $Id: CutParametric.cpp,v 1.23 2008-01-22 20:44:36 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -37,7 +37,7 @@ extern Context_T CTX;
StringXNumber CutParametricOptions_Number[] = {
{GMSH_FULLRC, "MinU", GMSH_CutParametricPlugin::callbackMinU, 0.},
- {GMSH_FULLRC, "MaxU", GMSH_CutParametricPlugin::callbackMaxU, 2*M_PI},
+ {GMSH_FULLRC, "MaxU", GMSH_CutParametricPlugin::callbackMaxU, 2*3.1416},
{GMSH_FULLRC, "nPointsU", GMSH_CutParametricPlugin::callbackN, 360.},
{GMSH_FULLRC, "ConnectPoints", GMSH_CutParametricPlugin::callbackConnect, 0.},
{GMSH_FULLRC, "iView", NULL, -1.}
diff --git a/Plugin/HarmonicToTime.cpp b/Plugin/HarmonicToTime.cpp
index 8b34994be5..653c520ea1 100644
--- a/Plugin/HarmonicToTime.cpp
+++ b/Plugin/HarmonicToTime.cpp
@@ -1,4 +1,4 @@
-// $Id: HarmonicToTime.cpp,v 1.12 2007-09-11 14:01:55 geuzaine Exp $
+// $Id: HarmonicToTime.cpp,v 1.13 2008-01-22 20:44:36 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -20,6 +20,7 @@
// 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/TransformLatLon.cpp b/Plugin/TransformLatLon.cpp
index 34cdd9c0a0..ced9c5bdb3 100644
--- a/Plugin/TransformLatLon.cpp
+++ b/Plugin/TransformLatLon.cpp
@@ -1,4 +1,4 @@
-// $Id: TransformLatLon.cpp,v 1.1 2008-01-10 14:56:54 remacle Exp $
+// $Id: TransformLatLon.cpp,v 1.2 2008-01-22 20:44:36 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -20,6 +20,7 @@
// 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/contrib/Netgen/Makefile b/contrib/Netgen/Makefile
index ac54f6ac9c..6df1c5484e 100644
--- a/contrib/Netgen/Makefile
+++ b/contrib/Netgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.26 2008-01-20 11:39:47 geuzaine Exp $
+# $Id: Makefile,v 1.27 2008-01-22 20:44:36 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -142,7 +142,7 @@ ${LIB}: ${OBJ}
# don't apply ugly hack above for files in this directory
nglib_addon${OBJEXT}:
- ${CXX} ${CFLAGS} ${DASH}c $<
+ ${CXX} ${CFLAGS} ${DASH}c nglib_addon.cpp
clean:
rm -f *${OBJEXT} libsrc/*/*${OBJEXT}
--
GitLab