diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-01-12 16:54:37 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-01-12 16:54:37 +0000 |
| commit | d944e35af84a59c9dc88f7027b04c9528cc1bf9b (patch) | |
| tree | 449420f406a63fc0df73fcfd4201e35f98678407 /src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h | |
| parent | 178f37684b9f3bebf95534568b5ef54c15e11c63 (diff) | |
| parent | 9aa92aa2b504d9530125a6a164f76c11f45d8bb5 (diff) | |
Backmerge of last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@959 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a5c6ef0ae2ee1e18fff88b98131ff4d14a252152
Diffstat (limited to 'src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h')
| -rw-r--r-- | src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h index 3e761473..19417ace 100644 --- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h +++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h @@ -27,7 +27,6 @@ #include <gudhi/Persistent_cohomology/Field_Zp.h> #include <gudhi/Simple_object_pool.h> -#include <boost/tuple/tuple.hpp> #include <boost/intrusive/set.hpp> #include <boost/pending/disjoint_sets.hpp> #include <boost/intrusive/list.hpp> @@ -223,7 +222,7 @@ class Persistent_cohomology { // Sparse column type for the annotation of the boundary of an element. typedef std::vector<std::pair<Simplex_key, Arith_element> > A_ds_type; // Persistent interval type. The Arith_element field is used for the multi-field framework. - typedef boost::tuple<Simplex_handle, Simplex_handle, Arith_element> Persistent_interval; + typedef std::tuple<Simplex_handle, Simplex_handle, Arith_element> Persistent_interval; /** \brief Initializes the Persistent_cohomology class. * |