diff options
author | Gard Spreemann <gspr@nonempty.org> | 2020-12-16 15:15:38 +0100 |
---|---|---|
committer | Gard Spreemann <gspr@nonempty.org> | 2020-12-16 15:15:38 +0100 |
commit | b6a3def70b15baf2dda0844762dcd291e240d2c1 (patch) | |
tree | df4d6b690d0fc7f46d259364fe4a6fcc85f62b40 /src/Alpha_complex/include/gudhi/Alpha_complex_3d.h | |
parent | 1c05c20d7cf92c96b5036620cc892cb956c96785 (diff) | |
parent | cf36a3971fb6a0ed37577295d7f1f13a930d1dba (diff) |
Merge tag 'tags/gudhi-release-3.4.0' into dfsg/latest
Diffstat (limited to 'src/Alpha_complex/include/gudhi/Alpha_complex_3d.h')
-rw-r--r-- | src/Alpha_complex/include/gudhi/Alpha_complex_3d.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h b/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h index f56e12d0..4e5fc933 100644 --- a/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h +++ b/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h @@ -38,8 +38,6 @@ #include <CGAL/iterator.h> #include <CGAL/version.h> // for CGAL_VERSION_NR -#include <Eigen/src/Core/util/Macros.h> // for EIGEN_VERSION_AT_LEAST - #include <boost/container/static_vector.hpp> #include <iostream> @@ -56,10 +54,6 @@ # error Alpha_complex_3d is only available for CGAL >= 4.11 #endif -#if !EIGEN_VERSION_AT_LEAST(3,1,0) -# error Alpha_complex_3d is only available for Eigen3 >= 3.1.0 installed with CGAL -#endif - namespace Gudhi { namespace alpha_complex { @@ -160,8 +154,10 @@ class Alpha_complex_3d { using Kernel = CGAL::Periodic_3_regular_triangulation_traits_3<Predicates>; }; + public: using Kernel = typename Kernel_3<Predicates, Weighted, Periodic>::Kernel; + private: using TdsVb = typename std::conditional<Periodic, CGAL::Periodic_3_triangulation_ds_vertex_base_3<>, CGAL::Triangulation_ds_vertex_base_3<>>::type; |