From 6c2b7843231b86cfbd2fceab15a5d98d8ee3f2b6 Mon Sep 17 00:00:00 2001
From: Hugues Delorme <delorme.hugues@fougue.pro>
Date: Fri, 15 Apr 2016 09:03:47 +0200
Subject: [PATCH] gmio_support: fix compiler errors with OpenCascade v7.0.0

---
 src/gmio_support/stl_occ.cpp                     |  1 -
 src/gmio_support/stl_occ.h                       | 11 ++++-------
 .../opencascade/MeshVS_DataSource.hxx            |  2 +-
 .../opencascade/Standard_Version.hxx             | 16 ++++++++++++++++
 4 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 tests/fake_support/opencascade/Standard_Version.hxx

diff --git a/src/gmio_support/stl_occ.cpp b/src/gmio_support/stl_occ.cpp
index 9bfc305..441edcf 100644
--- a/src/gmio_support/stl_occ.cpp
+++ b/src/gmio_support/stl_occ.cpp
@@ -22,7 +22,6 @@
 #include <TColgp_SequenceOfXYZ.hxx>
 
 #ifndef GMIO_SUPPORT_STL_OCC_NO_MESHVS_DATASOURCE
-#  include <Handle_MeshVS_DataSource.hxx>
 #  include <MeshVS_DataSource.hxx>
 #  include <TColStd_PackedMapOfInteger.hxx>
 #endif // !GMIO_SUPPORT_STL_OCC_NO_MESHVS_DATASOURCE
diff --git a/src/gmio_support/stl_occ.h b/src/gmio_support/stl_occ.h
index 1a82522..5a10e3d 100644
--- a/src/gmio_support/stl_occ.h
+++ b/src/gmio_support/stl_occ.h
@@ -31,18 +31,15 @@
 #include "../gmio_stl/stl_mesh.h"
 #include "../gmio_stl/stl_mesh_creator.h"
 
+#include <StlMesh_Mesh.hxx>
+#include <StlMesh_MeshTriangle.hxx>
 #include <StlMesh_SequenceOfMeshTriangle.hxx>
-
-class Handle_StlMesh_Mesh;
-class StlMesh_Mesh;
-class Handle_StlMesh_MeshTriangle;
-class TColgp_SequenceOfXYZ;
+#include <TColgp_SequenceOfXYZ.hxx>
 
 #ifndef GMIO_SUPPORT_STL_OCC_NO_MESHVS_DATASOURCE
+#  include <MeshVS_DataSource.hxx>
 #  include <TColStd_Array1OfReal.hxx>
 #  include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
-class Handle_MeshVS_DataSource;
-class MeshVS_DataSource;
 #endif // !GMIO_SUPPORT_STL_OCC_NO_MESHVS_DATASOURCE
 
 /*! Forward iterator over the triangles of OpenCascade's StlMesh_Mesh
diff --git a/tests/fake_support/opencascade/MeshVS_DataSource.hxx b/tests/fake_support/opencascade/MeshVS_DataSource.hxx
index deabbd6..5572e74 100644
--- a/tests/fake_support/opencascade/MeshVS_DataSource.hxx
+++ b/tests/fake_support/opencascade/MeshVS_DataSource.hxx
@@ -2,7 +2,7 @@
 #define _MeshVS_DataSource_HeaderFile
 
 #include "Standard_TypeDef.hxx"
-
+#include "Handle_MeshVS_DataSource.hxx"
 class TColStd_Array1OfReal;
 class TColStd_PackedMapOfInteger;
 
diff --git a/tests/fake_support/opencascade/Standard_Version.hxx b/tests/fake_support/opencascade/Standard_Version.hxx
new file mode 100644
index 0000000..10c376f
--- /dev/null
+++ b/tests/fake_support/opencascade/Standard_Version.hxx
@@ -0,0 +1,16 @@
+#ifndef _Standard_Version_HeaderFile
+#define _Standard_Version_HeaderFile
+
+#define OCC_VERSION_MAJOR         6
+#define OCC_VERSION_MINOR         9
+#define OCC_VERSION_MAINTENANCE   1
+
+#define OCC_VERSION               6.9
+#define OCC_VERSION_STRING       "6.9"
+#define OCC_VERSION_COMPLETE     "6.9.1"
+
+#define OCC_VERSION_STRING_EXT OCC_VERSION_COMPLETE
+
+#define OCC_VERSION_HEX    (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE)
+
+#endif  /* _Standard_Version_HeaderFile */