From c8f335c65f528525cc5af3113b00f9e9dc7db900 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 25 Oct 2008 12:13:36 +0000
Subject: [PATCH] fix msvc compile
---
Geo/MElement.cpp | 1 -
Geo/MElement.h | 8 ++++----
utils/misc/variables.msvc | 3 ++-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp
index 1eb6015326..a2775ae293 100644
--- a/Geo/MElement.cpp
+++ b/Geo/MElement.cpp
@@ -8,7 +8,6 @@
#include "MElement.h"
#include "GEntity.h"
#include "GFace.h"
-#include "FunctionSpace.h"
#include "Message.h"
#include "StringUtils.h"
diff --git a/Geo/MElement.h b/Geo/MElement.h
index 5181230ae0..9b07bc1d47 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -14,13 +14,13 @@
#include "MEdge.h"
#include "MFace.h"
#include "Message.h"
+#include "FunctionSpace.h"
struct IntPt{
double pt[3];
double weight;
};
-class gmshFunctionSpace;
class GFace;
// A mesh element.
@@ -362,7 +362,7 @@ class MLine : public MElement {
{
MVertex *tmp = _v[0]; _v[0] = _v[1]; _v[1] = tmp;
}
- virtual const gmshFunctionSpace* getFunctionSpace(int=-1) const;
+ virtual const gmshFunctionSpace* getFunctionSpace(int o=-1) const;
virtual bool isInside(double u, double v, double w, double tol=1.e-8)
{
if(u < -(1. + tol) || u > (1. + tol))
@@ -573,7 +573,7 @@ class MTriangle : public MElement {
{
MVertex *tmp = _v[1]; _v[1] = _v[2]; _v[2] = tmp;
}
- virtual const gmshFunctionSpace* getFunctionSpace(int=-1) const;
+ virtual const gmshFunctionSpace* getFunctionSpace(int o=-1) const;
virtual bool isInside(double u, double v, double w, double tol=1.e-8)
{
if(u < (-tol) || v < (-tol) || u > ((1. + tol) - v))
@@ -1199,7 +1199,7 @@ class MTetrahedron : public MElement {
virtual double distoShapeMeasure();
virtual double etaShapeMeasure();
void xyz2uvw(double xyz[3], double uvw[3]);
- virtual const gmshFunctionSpace* getFunctionSpace(int=-1) const;
+ virtual const gmshFunctionSpace* getFunctionSpace(int o=-1) const;
virtual bool isInside(double u, double v, double w, double tol=1.e-8)
{
if(u < (-tol) || v < (-tol) || w < (-tol) || u > ((1. + tol) - v - w))
diff --git a/utils/misc/variables.msvc b/utils/misc/variables.msvc
index fdbfbcc45a..4bdb966f9f 100644
--- a/utils/misc/variables.msvc
+++ b/utils/misc/variables.msvc
@@ -128,8 +128,9 @@ ifeq (${ENABLE_GUI},1)
GMSH_LIBS+=/SUBSYSTEM:WINDOWS
else
GMSH_LIBS+=Common/Main.obj lib/*.lib
+ GMSH_LIBS+=ws2_32.lib
ifeq (${ENABLE_OCC},1)
- GMSH_LIBS+=advapi32.lib user32.lib ws2_32.lib
+ GMSH_LIBS+=advapi32.lib user32.lib
endif
endif
--
GitLab