summaryrefslogtreecommitdiff
path: root/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-07-01 07:58:48 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-07-01 07:58:48 +0000
commit569b7265b27ee5a2a9b1f9f41bd1dc3c74221a27 (patch)
tree479cb54ecde1076a685af52410de0b228641a91a /src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
parent8a84688f538eabfacfbbfdbf6cc8e159b1c3b412 (diff)
parente5085c7eeacb09696d415a2877855b989262e454 (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_simplifiable_complex.h')
-rw-r--r--src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
index 94a125c1..171efd4b 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
@@ -30,7 +30,7 @@
namespace Gudhi {
-namespace skbl {
+namespace skeleton_blocker {
/**
* Returns true iff the blocker 'sigma' is popable.
@@ -459,7 +459,9 @@ Skeleton_blocker_complex<SkeletonBlockerDS>::notify_changed_edges(Vertex_handle
}
-} // namespace skbl
+} // namespace skeleton_blocker
+
+namespace skbl = skeleton_blocker;
} // namespace Gudhi