]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Opencascade: Fix includes for version 7
authorMatthias Maier <tamiko@43-1.org>
Tue, 21 Mar 2017 18:51:15 +0000 (13:51 -0500)
committerMatthias Maier <tamiko@43-1.org>
Tue, 21 Mar 2017 18:51:15 +0000 (13:51 -0500)
source/opencascade/boundary_lib.cc
source/opencascade/utilities.cc

index 7f623d03188a04c1f50f81ab8198dfece8df7feb..05f0063dfe1fc06577d006d45829ace20ccf3811 100644 (file)
@@ -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
 
index ddc50943b83375faa5e15de54a94a512f06b27ad..0e97c3fc1211639f3837b1d14baabbfdb5f7a6a8 100644 (file)
@@ -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>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.