]> https://gitweb.dealii.org/ - dealii.git/commitdiff
fix compilation against opencascade on linux targets 371/head
authorMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 23 Dec 2014 20:39:09 +0000 (21:39 +0100)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 23 Dec 2014 22:30:23 +0000 (23:30 +0100)
include/deal.II/opencascade/boundary_lib.h
include/deal.II/opencascade/utilities.h

index e1633b11a009864f96a5f4bd5a86d94a7f250b5c..af936c0574a94b182e89ed67a9d18c37ba03e61d 100644 (file)
 #include <deal.II/opencascade/utilities.h>
 #include <deal.II/grid/tria_boundary.h>
 
+// We have to clean up certain name clashes prior to any opencascade header
+// inclusion. Unfortunately, this is clumsy and should be resolved by
+// renaming our very own includes someday...
+// --Maier, 2014
+#define HAVE_CONFIG_H
+#undef HAVE_SYS_TYPES_H
+#undef HAVE_SYS_TIMES_H
+#undef HAVE_SYS_TIME_H
+#undef HAVE_UNISTD_H
+#undef HAVE_GETHOSTNAME
 #include <BRepAdaptor_Curve.hxx>
 #include <Adaptor3d_Curve.hxx>
+#undef HAVE_CONFIG_H
 
 DEAL_II_NAMESPACE_OPEN
 
index 8347fa14d51e1339fe7ed95b4d8980b01be80794..d01cc623ebe0c25581f7e2f116a5a2605419dd3e 100644 (file)
 #ifdef DEAL_II_WITH_OPENCASCADE
 
 #include <deal.II/grid/tria.h>
+#include <deal.II/base/point.h>
 
 #include <string>
+
+// We have to clean up certain name clashes prior to any opencascade header
+// inclusion. Unfortunately, this is clumsy and should be resolved by
+// renaming our very own includes someday...
+// --Maier, 2014
+#define HAVE_CONFIG_H
+#undef HAVE_SYS_TYPES_H
+#undef HAVE_SYS_TIMES_H
+#undef HAVE_SYS_TIME_H
+#undef HAVE_UNISTD_H
+#undef HAVE_GETHOSTNAME
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
@@ -36,8 +48,8 @@
 #include <TopoDS_Wire.hxx>
 #include <IFSelect_ReturnStatus.hxx>
 #include <gp_Pnt.hxx>
+#undef HAVE_CONFIG_H
 
-#include <deal.II/base/point.h>
 
 
 DEAL_II_NAMESPACE_OPEN

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.