From d66fe6b6e70614b9f6d88a00f5333049854afa51 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 21 Mar 2017 12:58:41 +0000
Subject: [PATCH] reduce dependencies in discreteDiskFace
---
Geo/discreteFace.cpp | 13 ++++++++-----
Geo/discreteFace.h | 11 ++---------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/Geo/discreteFace.cpp b/Geo/discreteFace.cpp
index cb5906d65b..c4082913c8 100644
--- a/Geo/discreteFace.cpp
+++ b/Geo/discreteFace.cpp
@@ -3,6 +3,10 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to the public mailing list <gmsh@onelab.info>.
+#include <stack>
+#include <queue>
+#include <complex>
+#include <stdlib.h>
#include "GmshConfig.h"
#include "GmshMessage.h"
#include "discreteFace.h"
@@ -12,16 +16,15 @@
#include "GFaceCompound.h"
#include "Context.h"
#include "OS.h"
-#include <stack>
-#include <queue>
-#include <complex>
+#include "meshPartitionObjects.h"
+#include "meshPartitionOptions.h"
+#include "meshPartition.h"
+#include "MPoint.h"
#if defined(HAVE_PETSC)
#include "linearSystemPETSc.h"
#endif
-#include "MPoint.h"
-
#if defined(HAVE_METIS)
extern "C" {
#include <metis.h>
diff --git a/Geo/discreteFace.h b/Geo/discreteFace.h
index 372311a6d7..d27263fc6c 100644
--- a/Geo/discreteFace.h
+++ b/Geo/discreteFace.h
@@ -10,23 +10,16 @@
#include "GFace.h"
#include "discreteEdge.h"
#include "MEdge.h"
-#include "meshPartitionObjects.h"
-#include "meshPartitionOptions.h"
-#include "meshPartition.h"
#include "MTriangle.h"
#include "MEdge.h"
#include "MLine.h"
-#include <stdlib.h>
class discreteDiskFace;
class triangulation;
-
class discreteFace : public GFace {
- // FIXME we should at the end use a
- // mesh() function that is specific to
- // discreteFace
- // we should also SAVE those data's
+ // FIXME we should at the end use a mesh() function that is specific to
+ // discreteFace; we should also SAVE those data's
public:
discreteFace(GModel *model, int num);
virtual ~discreteFace() {}
--
GitLab