File 0002-Fix-build-with-CGAL-4.13-and-later.patch of Package mshr

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Fix-build-with-CGAL-4.13-and-later.patch of Package mshr

From 0f98a5a33ec81959bededf721d4b335c88e0c3c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sun, 9 Feb 2020 02:54:11 +0100
Subject: [PATCH 2/2] Fix build with CGAL 4.13 and later

With CGAL 4.13, "Uniformized between Mesh_3::internal and internal::Mesh_3"
(https://github.com/CGAL/cgal/commit/1078e00e7f46655a) the wrapping
order has been swapped.
---
 src/make_multicomponent_mesh_3.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/make_multicomponent_mesh_3.h b/src/make_multicomponent_mesh_3.h
index 0d6a2db..3d21487 100644
--- a/src/make_multicomponent_mesh_3.h
+++ b/src/make_multicomponent_mesh_3.h
@@ -20,6 +20,7 @@
 
 #include <CGAL/make_mesh_3.h>
 #include <CGAL/refine_mesh_3.h>
+#include <CGAL/version.h>
 
 
 template<class C3T3, class MeshDomain, class MeshCriteria>
@@ -34,14 +35,19 @@ void make_multicomponent_mesh_3_impl(C3T3& c3t3,
                                      const CGAL::parameters::internal::Mesh_3_options& 
                                      mesh_options = CGAL::parameters::internal::Mesh_3_options())
 {
+#if CGAL_VERSION_NR >= 1041301000
+  namespace internal_Mesh_3 = CGAL::Mesh_3::internal;
+#else
+  namespace internal_Mesh_3 = CGAL::internal::Mesh_3;
+#endif
   //std::cout << "Number of vertices initially: " << c3t3.triangulation().number_of_vertices() << std::endl;
 
   // Initialize c3t3 with points from the special features
-  CGAL::internal::Mesh_3::C3t3_initializer< 
+  internal_Mesh_3::C3t3_initializer<
     C3T3,
     MeshDomain,
     MeshCriteria,
-    CGAL::internal::Mesh_3::has_Has_features<MeshDomain>::value > () (c3t3,
+    internal_Mesh_3::has_Has_features<MeshDomain>::value > () (c3t3,
                                                                       domain,
                                                                       criteria,
                                                                       with_features);
@@ -49,7 +55,7 @@ void make_multicomponent_mesh_3_impl(C3T3& c3t3,
   // std::cout << "Number of vertices after features: " << c3t3.triangulation().number_of_vertices() << std::endl;
   
   // Inserts points from all connected components to the mesh
-  CGAL::internal::Mesh_3::init_c3t3(c3t3, domain, criteria, 0);
+  internal_Mesh_3::init_c3t3(c3t3, domain, criteria, 0);
   // std::cout << "Number of vertices before meshing: " << c3t3.triangulation().number_of_vertices() << std::endl;
   
   // Build mesher and launch refinement process
-- 
2.25.0

Places

File 0002-Fix-build-with-CGAL-4.13-and-later.patch of Package mshr

Places