diff options
author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-02-22 16:49:21 +0000 |
---|---|---|
committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-02-22 16:49:21 +0000 |
commit | 899838ae83f4a9cea085ba877e91a7ca035fbb4d (patch) | |
tree | 76c56df09e6ad006f94aa46b0d355492e4830f4b /src/Witness_complex | |
parent | 81575612aaa0552307a6c744c327765ff89165e4 (diff) | |
parent | 707120336966af3dffb8b54cd0095fc1bcc3836d (diff) |
Merged with trunk + minor changes
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2094 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 6b23778cbe43e7697cd325039e843758a263d927
Diffstat (limited to 'src/Witness_complex')
3 files changed, 3 insertions, 2 deletions
diff --git a/src/Witness_complex/example/example_strong_witness_complex_off.cpp b/src/Witness_complex/example/example_strong_witness_complex_off.cpp index 61b8bc4a..c9a3b543 100644 --- a/src/Witness_complex/example/example_strong_witness_complex_off.cpp +++ b/src/Witness_complex/example/example_strong_witness_complex_off.cpp @@ -17,7 +17,7 @@ typedef CGAL::Epick_d<CGAL::Dynamic_dimension_tag> K; typedef typename K::Point_d Point_d; typedef typename Gudhi::witness_complex::Euclidean_strong_witness_complex<K> Witness_complex; -typedef std::vector< Vertex_handle > typeVectorVertex; +typedef std::vector< typename Gudhi::Simplex_tree<>::Vertex_handle > typeVectorVertex; typedef std::vector< Point_d > Point_vector; int main(int argc, char * const argv[]) { diff --git a/src/Witness_complex/example/example_witness_complex_off.cpp b/src/Witness_complex/example/example_witness_complex_off.cpp index 751d2d4c..38c6bedc 100644 --- a/src/Witness_complex/example/example_witness_complex_off.cpp +++ b/src/Witness_complex/example/example_witness_complex_off.cpp @@ -17,7 +17,7 @@ typedef CGAL::Epick_d<CGAL::Dynamic_dimension_tag> K; typedef typename K::Point_d Point_d; typedef typename Gudhi::witness_complex::Euclidean_witness_complex<K> Witness_complex; -typedef std::vector< Vertex_handle > typeVectorVertex; +typedef std::vector< typename Gudhi::Simplex_tree<>::Vertex_handle > typeVectorVertex; typedef std::vector< Point_d > Point_vector; int main(int argc, char * const argv[]) { diff --git a/src/Witness_complex/test/test_simple_witness_complex.cpp b/src/Witness_complex/test/test_simple_witness_complex.cpp index b47ebe4d..bb1df72d 100644 --- a/src/Witness_complex/test/test_simple_witness_complex.cpp +++ b/src/Witness_complex/test/test_simple_witness_complex.cpp @@ -19,6 +19,7 @@ #include <vector> typedef Gudhi::Simplex_tree<> Simplex_tree; +typedef typename Simplex_tree::Vertex_handle Vertex_handle; typedef std::vector< Vertex_handle > typeVectorVertex; typedef CGAL::Epick_d<CGAL::Dynamic_dimension_tag> Kernel; typedef typename Kernel::FT FT; |