From 16601a5858faf228a29cf406f8a71d43d46e6bf4 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 8 Mar 2012 16:30:16 +0000
Subject: [PATCH] fix compile (sigh...)

---
 Geo/GModel.cpp | 9 +++++----
 Geo/GModel.h   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 3d443e936e..2b8aaf115a 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -2066,9 +2066,9 @@ void GModel::save(std::string fileName)
   GModel::setCurrent(temp);
 }
 
-GFaceCompound* GModel::addCompoundFace(std::vector<GFace*> faces, int param, int typeS)
+GFace* GModel::addCompoundFace(std::vector<GFace*> faces, int param, int typeS)
 {
-
+#if defined(HAVE_SOLVER)
   int num =  getMaxElementaryNumber(2) + 1;
 
   std::list<GFace*> comp(faces.begin(), faces.end());
@@ -2085,9 +2085,10 @@ GFaceCompound* GModel::addCompoundFace(std::vector<GFace*> faces, int param, int
   GFaceCompound *gfc = new GFaceCompound(this, num, comp, U0, typ, typeS);
 
   add(gfc);
-
   return gfc;
-
+#else
+  return 0;
+#endif
 }
 
 GVertex *GModel::addVertex(double x, double y, double z, double lc)
diff --git a/Geo/GModel.h b/Geo/GModel.h
index 7ab6409881..6548888797 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -436,7 +436,6 @@ class GModel
   void setFactory(std::string name);
 
   // create brep geometry entities using the factory
-  GFaceCompound *addCompoundFace(std::vector<GFace*> faces, int typeP, int typeS);
   GVertex *addVertex(double x, double y, double z, double lc);
   GEdge *addLine(GVertex *v1, GVertex *v2);
   GEdge *addCircleArcCenter(double x, double y, double z, GVertex *start, GVertex *end);
@@ -456,6 +455,7 @@ class GModel
   void addRuledFaces(std::vector<std::vector<GEdge *> > edges);
   GFace *addFace(std::vector<GEdge *> edges, std::vector< std::vector<double > > points);
   GFace *addPlanarFace(std::vector<std::vector<GEdge *> > edges);
+  GFace *addCompoundFace(std::vector<GFace*> faces, int typeP, int typeS);
   GRegion *addVolume(std::vector<std::vector<GFace*> > faces);
 
   // create solid geometry primitives using the factory
-- 
GitLab