diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-18 08:03:56 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-18 08:03:56 +0100 |
| commit | 8b7a25482dfd9c38825e022d5f95135f0aade738 (patch) | |
| tree | e986157f9921aa261a58c8d812f2802cab248310 /src/Collapse/include/gudhi/Flag_complex_edge_collapser.h | |
| parent | d33eaa80b7c337fde11bb5db60df79fbc81fb483 (diff) | |
| parent | ad5d38986542715e0a0518537afaadcda71d9c49 (diff) | |
merge master and resolve conflicts
Diffstat (limited to 'src/Collapse/include/gudhi/Flag_complex_edge_collapser.h')
| -rw-r--r-- | src/Collapse/include/gudhi/Flag_complex_edge_collapser.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h b/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h index b6b7f7c1..713c6608 100644 --- a/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h +++ b/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h @@ -18,6 +18,7 @@ #include <boost/iterator/iterator_facade.hpp> #include <Eigen/Sparse> +#include <Eigen/src/Core/util/Macros.h> // for EIGEN_VERSION_AT_LEAST #ifdef GUDHI_USE_TBB #include <tbb/parallel_sort.h> @@ -34,6 +35,11 @@ #include <iterator> // for std::inserter #include <type_traits> // for std::decay +// Make compilation fail - required for external projects - https://github.com/GUDHI/gudhi-devel/issues/10 +#if !EIGEN_VERSION_AT_LEAST(3,1,0) +# error Edge Collapse is only available for Eigen3 >= 3.1.0 +#endif + namespace Gudhi { namespace collapse { |