summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorROUVREAU Vincent <vincent.rouvreau@inria.fr>2020-09-11 14:35:39 +0200
committerROUVREAU Vincent <vincent.rouvreau@inria.fr>2020-09-11 14:35:39 +0200
commitd299e943d6fd07a58a270fe685dac7b5d5d23964 (patch)
tree07584b896f51f86144ee25fc57f415e8211b9fe3
parent171ddab9b7a50f0303d7201fa547dbfb445f9698 (diff)
fonction was renamed between 5.1 and 5.2
-rw-r--r--src/Alpha_complex/include/gudhi/Alpha_complex/Alpha_kernel_d.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex/Alpha_kernel_d.h b/src/Alpha_complex/include/gudhi/Alpha_complex/Alpha_kernel_d.h
index b64e4f59..a4824207 100644
--- a/src/Alpha_complex/include/gudhi/Alpha_complex/Alpha_kernel_d.h
+++ b/src/Alpha_complex/include/gudhi/Alpha_complex/Alpha_kernel_d.h
@@ -82,6 +82,7 @@ class Alpha_kernel_d<Kernel, true> {
private:
// Kernel for functions access.
Kernel kernel_;
+
public:
// Fake type for compilation to succeed (cf. std::conditional in Alpha_complex.h)
using Point_d = void;
@@ -98,7 +99,13 @@ class Alpha_kernel_d<Kernel, true> {
template<class PointIterator>
Sphere get_sphere(PointIterator begin, PointIterator end) const {
+ // power_center_d_object has been renamed between CGAL 5.1 and 5.2
+#if defined CGAL_VERSION_NR >= 1050101000 && defined CGAL_VERSION_NR < 1050201000
return kernel_.power_center_d_object()(begin, end);
+#endif
+#if CGAL_VERSION_NR >= 1050201000
+ return kernel_.construct_power_sphere_d_object()(begin, end);
+#endif
}
template<class PointIterator>
@@ -112,7 +119,13 @@ class Alpha_kernel_d<Kernel, true> {
}
bool is_gabriel(const Sphere& circumcenter, const Weighted_point_d& point) {
+ // power_center_d_object has been renamed between CGAL 5.1 and 5.2
+#if defined CGAL_VERSION_NR >= 1050101000 && defined CGAL_VERSION_NR < 1050201000
return kernel_.power_distance_d_object()(circumcenter, point) >= 0;
+#endif
+#if CGAL_VERSION_NR >= 1050201000
+ return kernel_.compute_power_product_d_object()(circumcenter, point) >= 0;
+#endif
}
};