diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-07-01 07:58:48 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-07-01 07:58:48 +0000 |
commit | 569b7265b27ee5a2a9b1f9f41bd1dc3c74221a27 (patch) | |
tree | 479cb54ecde1076a685af52410de0b228641a91a /src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h | |
parent | 8a84688f538eabfacfbbfdbf6cc8e159b1c3b412 (diff) | |
parent | e5085c7eeacb09696d415a2877855b989262e454 (diff) |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1375 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: e09c451302009b8a4f8882bb286829b485c605ab
Diffstat (limited to 'src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h')
-rw-r--r-- | src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h index e3c16d88..1bd66289 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h @@ -27,7 +27,7 @@ namespace Gudhi { -namespace skbl { +namespace skeleton_blocker { template<class ComplexType> class Skeleton_blocker_sub_complex; @@ -290,7 +290,9 @@ class Skeleton_blocker_link_complex : public Skeleton_blocker_sub_complex< } }; -} // namespace skbl +} // namespace skeleton_blocker + +namespace skbl = skeleton_blocker; } // namespace Gudhi |