diff options
author | cjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-10 18:32:40 +0000 |
---|---|---|
committer | cjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-10 18:32:40 +0000 |
commit | 956403526264a5dc25f289940f066da5dabc7cf4 (patch) | |
tree | 777627a8c9dfc82ae9f20d16d567ee29c03e8f29 /src/Contraction/include | |
parent | 75a8bf8132d2bade9ccc31147db00bf29eeb7589 (diff) | |
parent | 2ecd97ff50b01f864944443b3a2a8ea0220d9b10 (diff) |
Rename namespaces according to convention
+ Missing Boost_THREAD_LIBRARY
+ Useless typename
+ Use TBB_LIBRARIES
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/fix_naming@1274 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 5c02ec481b62ef52b40d849e76e3d333e2ca4e7c
Diffstat (limited to 'src/Contraction/include')
-rw-r--r-- | src/Contraction/include/gudhi/Edge_contraction.h | 2 | ||||
-rw-r--r-- | src/Contraction/include/gudhi/Skeleton_blocker_contractor.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Contraction/include/gudhi/Edge_contraction.h b/src/Contraction/include/gudhi/Edge_contraction.h index 1b2cdee9..5af13c3e 100644 --- a/src/Contraction/include/gudhi/Edge_contraction.h +++ b/src/Contraction/include/gudhi/Edge_contraction.h @@ -127,7 +127,7 @@ while ensuring its homotopy type is preserved during the contraction (edge are c using namespace std; using namespace Gudhi; -using namespace skbl; +using namespace skeleton_blocker; using namespace contraction; struct Geometry_trait{ diff --git a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h index f650473a..df884c93 100644 --- a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h +++ b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h @@ -100,7 +100,7 @@ Contraction_visitor<Profile>* make_remove_popable_blockers_visitor() { * */ template<class GeometricSimplifiableComplex, class EdgeProfile = Edge_profile<GeometricSimplifiableComplex>> -class Skeleton_blocker_contractor : private skbl::Dummy_complex_visitor< +class Skeleton_blocker_contractor : private skeleton_blocker::Dummy_complex_visitor< typename GeometricSimplifiableComplex::Vertex_handle> { GeometricSimplifiableComplex& complex_; |