From: Matthias Maier <tamiko@43-1.org>
Date: Tue, 21 Mar 2017 18:51:15 +0000 (-0500)
Subject: Opencascade: Fix includes for version 7
X-Git-Tag: v8.5.0-rc1~20^2~8
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0af9790bf0cb8c531228dd0eb23adb637ec4208e;p=dealii.git

Opencascade: Fix includes for version 7
---

diff --git a/source/opencascade/boundary_lib.cc b/source/opencascade/boundary_lib.cc
index 7f623d0318..05f0063dfe 100644
--- a/source/opencascade/boundary_lib.cc
+++ b/source/opencascade/boundary_lib.cc
@@ -31,8 +31,11 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <BRepTools.hxx>
 #include <ShapeAnalysis_Surface.hxx>
 #include <TopoDS.hxx>
-#include <Adaptor3d_HCurve.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+
+#include <Standard_Version.hxx>
+#if (OCC_VERSION_MAJOR < 7)
+#  include <Handle_Adaptor3d_HCurve.hxx>
+#endif
 
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
diff --git a/source/opencascade/utilities.cc b/source/opencascade/utilities.cc
index ddc50943b8..0e97c3fc12 100644
--- a/source/opencascade/utilities.cc
+++ b/source/opencascade/utilities.cc
@@ -43,7 +43,12 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <TopoDS_Edge.hxx>
 #include <TopExp_Explorer.hxx>
 
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Version.hxx>
+#if (OCC_VERSION_MAJOR < 7)
+#  include <Handle_Standard_Transient.hxx>
+#else
+#  include <Standard_Transient.hxx>
+#endif
 
 #include <TColStd_SequenceOfTransient.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>