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/Contraction/include/gudhi/Skeleton_blocker_contractor.h | |
| parent | 68753b3c28321e28eedd5829c94234da84e25c8d (diff) | |
| parent | f510a7e607b46ba8cc118cd787ff9b0b8bff091f (diff) | |
Merge branch 'master' into split_gudhi_python_in_modules
Diffstat (limited to 'src/Contraction/include/gudhi/Skeleton_blocker_contractor.h')
| -rw-r--r-- | src/Contraction/include/gudhi/Skeleton_blocker_contractor.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h index 7a99548d..c2b3157c 100644 --- a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h +++ b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h @@ -1,12 +1,11 @@ -/* 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(s): David Salinas * * Copyright (C) 2014 Inria * * Modification(s): + * - 2019/08 Vincent Rouvreau: Fix issue #10 for CGAL * - YYYY/MM Author: Description of the modification */ @@ -26,8 +25,9 @@ #include <gudhi/Skeleton_blocker/Skeleton_blocker_complex_visitor.h> #include <gudhi/Debug_utils.h> -// todo remove the queue to be independent from cgald +// todo remove the queue to be independent from cgal #include <CGAL/Modifiable_priority_queue.h> +#include <CGAL/version.h> // for CGAL_VERSION_NR #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> @@ -38,6 +38,11 @@ #include <utility> // for pair #include <vector> +// 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 contraction { |