diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-09-09 16:15:18 +0200 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-09-09 16:15:18 +0200 |
commit | d066372ac3ce5256fcd780a9dfc8e8f871fe65aa (patch) | |
tree | 12d609b56bc6052d4f0fa06981d4a7883ed1122c /src/Bottleneck_distance/include/gudhi/Bottleneck.h | |
parent | 68753b3c28321e28eedd5829c94234da84e25c8d (diff) | |
parent | f510a7e607b46ba8cc118cd787ff9b0b8bff091f (diff) |
Merge branch 'master' into split_gudhi_python_in_modules
Diffstat (limited to 'src/Bottleneck_distance/include/gudhi/Bottleneck.h')
-rw-r--r-- | src/Bottleneck_distance/include/gudhi/Bottleneck.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Bottleneck.h b/src/Bottleneck_distance/include/gudhi/Bottleneck.h index 105f1a93..82ba9f68 100644 --- a/src/Bottleneck_distance/include/gudhi/Bottleneck.h +++ b/src/Bottleneck_distance/include/gudhi/Bottleneck.h @@ -1,14 +1,13 @@ -/* This file is part of the Gudhi Library. The Gudhi library - * (Geometric Understanding in Higher Dimensions) is a generic C++ - * library for computational topology. - * +/* This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT. + * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details. * Author: Francois Godi * * Copyright (C) 2015 Inria * * Modification(s): - * - YYYY/MM Author: Description of the modification * - 2019/06 Vincent Rouvreau : Fix doxygen warning. + * - 2019/08 Vincent Rouvreau: Fix issue #10 for CGAL + * - YYYY/MM Author: Description of the modification */ #ifndef BOTTLENECK_H_ @@ -16,6 +15,8 @@ #include <gudhi/Graph_matching.h> +#include <CGAL/version.h> // for CGAL_VERSION_NR + #include <vector> #include <algorithm> // for max #include <limits> // for numeric_limits @@ -23,6 +24,11 @@ #include <cmath> #include <cfloat> // FLT_EVAL_METHOD +// Make compilation fail - required for external projects - https://github.com/GUDHI/gudhi-devel/issues/10 +#if CGAL_VERSION_NR < 1041101000 +# error Alpha_complex_3d is only available for CGAL >= 4.11 +#endif + namespace Gudhi { namespace persistence_diagram { |