]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Update required cgal version for intersection routines 14325/head
authorMarco Feder <marco.feder@sissa.it>
Fri, 30 Sep 2022 08:26:45 +0000 (10:26 +0200)
committerMarco Feder <marco.feder@sissa.it>
Fri, 30 Sep 2022 08:26:45 +0000 (10:26 +0200)
source/cgal/intersections.cc

index 0ad7918301d716d525e630eddc5070ffbcf1b710..2632d005cc377805afb90390144085e4ea7082bd 100644 (file)
@@ -269,7 +269,7 @@ namespace CGALWrappers
     compute_intersection(const std::array<Point<3>, 2> &first_simplex,
                          const std::array<Point<3>, 4> &second_simplex)
     {
-#  if DEAL_II_CGAL_VERSION_GTE(5, 1, 5)
+#  if DEAL_II_CGAL_VERSION_GTE(5, 5, 0)
       std::array<CGALPoint3, 4> pts0;
       std::array<CGALPoint3, 2> pts1;
       std::transform(
@@ -311,7 +311,7 @@ namespace CGALWrappers
     compute_intersection(const std::array<Point<3>, 3> &first_simplex,
                          const std::array<Point<3>, 4> &second_simplex)
     {
-#  if DEAL_II_CGAL_VERSION_GTE(5, 1, 5)
+#  if DEAL_II_CGAL_VERSION_GTE(5, 5, 0)
       std::array<CGALPoint3, 4> pts0;
       std::array<CGALPoint3, 3> pts1;
       std::transform(
@@ -464,7 +464,7 @@ namespace CGALWrappers
     const std::array<Point<3>, 2> &vertices1,
     const double                   tol)
   {
-#  if DEAL_II_CGAL_VERSION_GTE(5, 1, 5)
+#  if DEAL_II_CGAL_VERSION_GTE(5, 5, 0)
     std::array<CGALPoint3_exact, 8> pts;
     std::transform(
       vertices0.begin(), vertices0.end(), pts.begin(), [&](const Point<3> &p) {
@@ -521,7 +521,7 @@ namespace CGALWrappers
     const std::array<Point<3>, 4> &vertices1,
     const double                   tol)
   {
-#  if DEAL_II_CGAL_VERSION_GTE(5, 1, 5)
+#  if DEAL_II_CGAL_VERSION_GTE(5, 5, 0)
     std::array<CGALPoint3_exact, 8> pts_hex;
     std::array<CGALPoint3_exact, 4> pts_quad;
     std::transform(

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.