From 03c44c6ff9f2af838c33704fbdeab5ca7be576f7 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 7 Sep 2009 10:18:17 +0000
Subject: [PATCH] fix commit from samtech
---
Geo/GModel.h | 20 +-------------------
Geo/GModelIO_OCC.cpp | 8 --------
2 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/Geo/GModel.h b/Geo/GModel.h
index 20adaf4a09..7ea8a4dc4b 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -18,26 +18,8 @@
#include "SPoint3.h"
#include "SBoundingBox3d.h"
-#include "GmshDefines.h"
-class Standard_EXPORT Octree;
-#include "GmshDefines.h"
-class Standard_EXPORT FM_Internals;
-#include "GmshDefines.h"
-class Standard_EXPORT GEO_Internals;
-#include "GmshDefines.h"
-class Standard_EXPORT OCC_Internals;
-#include "GmshDefines.h"
-class Standard_EXPORT smooth_normals;
-#include "GmshDefines.h"
-class Standard_EXPORT FieldManager;
-#include "GmshDefines.h"
-class Standard_EXPORT CGNSOptions;
-#include "GmshDefines.h"
-class Standard_EXPORT gLevelset;
-
// A geometric model. The model is a "not yet" non-manifold B-Rep.
-#include "GmshDefines.h"
-class Standard_EXPORT GModel
+class GModel
{
private:
// the name of the model
diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp
index f2aea07e06..4f86f98def 100644
--- a/Geo/GModelIO_OCC.cpp
+++ b/Geo/GModelIO_OCC.cpp
@@ -16,10 +16,6 @@
#include "OpenFile.h"
#include "OCC_Connect.h"
-<<<<<<< GModelIO_OCC.cpp
-
-=======
->>>>>>> 1.78
#if defined(HAVE_OCC)
void OCC_Internals::buildLists()
@@ -982,10 +978,6 @@ int GModel::importOCCShape(const void *shape)
return 1;
}
-<<<<<<< GModelIO_OCC.cpp
-
-=======
->>>>>>> 1.78
#else
void GModel::_deleteOCCInternals()
--
GitLab