build_CGAL5.6

===================================================================

Gbp-Pq: Name build_CGAL5.6.patch

diff --git a/src/CSGCGALMeshGenerator3D.cpp b/src/CSGCGALMeshGenerator3D.cpp
index c2d7e90d212f806eb47587f41fd45e8cf26813c7..d7c2cb23d67cee6ac3e0dceab7e171ef9c62a892 100644 (file)
--- a/src/CSGCGALMeshGenerator3D.cpp
+++ b/src/CSGCGALMeshGenerator3D.cpp
@@ -333,11 +333,7 @@ void CSGCGALMeshGenerator3D::generate(std::shared_ptr<const CSGCGALDomain3D> csg
       make_multicomponent_mesh_3_impl<C3t3>(c3t3,
                                             domain,
                                             *criteria,
-                                            CGAL::parameters::no_exude(),
-                                            CGAL::parameters::no_perturb(),
-                                            CGAL::parameters::no_odt(),
-                                            CGAL::parameters::no_lloyd(),
-                                            true);
+                                           true);
       mutex.unlock();
       output_thread.join();
       dolfin::end();

diff --git a/src/make_multicomponent_mesh_3.h b/src/make_multicomponent_mesh_3.h
index 8ede9cf6b00a99421f1b63c1c111e4998f5f247c..e0fc46450ff295a3ce26c184716f4f19e75d0785 100644 (file)
--- a/src/make_multicomponent_mesh_3.h
+++ b/src/make_multicomponent_mesh_3.h
@@ -26,13 +26,7 @@ template<class C3T3, class MeshDomain, class MeshCriteria>
 void make_multicomponent_mesh_3_impl(C3T3& c3t3,
                                      const MeshDomain&   domain,
                                      const MeshCriteria& criteria,
-                                     const CGAL::parameters::internal::Exude_options& exude,
-                                     const CGAL::parameters::internal::Perturb_options& perturb,
-                                     const CGAL::parameters::internal::Odt_options& odt,
-                                     const CGAL::parameters::internal::Lloyd_options& lloyd,
-                                     const bool with_features,
-                                     const CGAL::parameters::internal::Mesh_3_options& 
-                                     mesh_options = CGAL::parameters::internal::Mesh_3_options())
+                                     const bool with_features)
 {
   //std::cout << "Number of vertices initially: " << c3t3.triangulation().number_of_vertices() << std::endl;
 
@@ -41,10 +35,17 @@ void make_multicomponent_mesh_3_impl(C3T3& c3t3,
     C3T3,
     MeshDomain,
     MeshCriteria,
+#if CGAL_VERSION_NR >= 1050601000
+    CGAL::internal::has_Has_features<MeshDomain>::value > () (c3t3,
+                                                              domain,
+                                                              criteria,
+                                                              with_features);
+#else
     CGAL::Mesh_3::internal::has_Has_features<MeshDomain>::value > () (c3t3,
-                                                                      domain,
-                                                                      criteria,
-                                                                      with_features);
+                                                              domain,
+                                                              criteria,
+                                                              with_features);
+#endif
 
   // std::cout << "Number of vertices after features: " << c3t3.triangulation().number_of_vertices() << std::endl;
   
@@ -55,7 +56,10 @@ void make_multicomponent_mesh_3_impl(C3T3& c3t3,
   // Build mesher and launch refinement process
   // Don't reset c3t3 as we just created it
   refine_mesh_3(c3t3, domain, criteria,
-                exude, perturb, odt, lloyd, CGAL::parameters::no_reset_c3t3(), mesh_options);
+               CGAL::parameters::no_exude(),
+               CGAL::parameters::no_perturb(),
+               CGAL::parameters::no_odt(),
+               CGAL::parameters::no_lloyd());
 }
 
 #endif