Merge from trunk

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1413 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: bb7801bb78feccf12ff73c6e82511806753db8dd

2 files changed, 12 insertions, 6 deletions

diff --git a/src/Skeleton_blocker/concept/SkeletonBlockerDS.h b/src/Skeleton_blocker/concept/SkeletonBlockerDS.h
index c0386590..3c650f99 100644
--- a/src/Skeleton_blocker/concept/SkeletonBlockerDS.h
+++ b/src/Skeleton_blocker/concept/SkeletonBlockerDS.h
@@ -12,7 +12,7 @@
 
 namespace Gudhi {
 
-namespace skbl {
+namespace skeleton_blocker {
 
 
 
@@ -118,8 +118,11 @@ struct SkeletonBlockerDS
 
 
 
-}  // namespace skbl
-}  // namespace GUDHI
+}  // namespace skeleton_blocker
+
+namespace skbl = skeleton_blocker;
+
+}  // namespace Gudhi
 
 
 #endif /* GUDHI_SKELETONBLOCKERDS_H_ */
diff --git a/src/Skeleton_blocker/concept/SkeletonBlockerGeometricDS.h b/src/Skeleton_blocker/concept/SkeletonBlockerGeometricDS.h
index 8fbf0d12..c5d52800 100644
--- a/src/Skeleton_blocker/concept/SkeletonBlockerGeometricDS.h
+++ b/src/Skeleton_blocker/concept/SkeletonBlockerGeometricDS.h
@@ -10,7 +10,7 @@
 #define GUDHI_SKELETONBLOCKERGEOMETRICDS_H_
 
 namespace Gudhi {
-namespace skbl {
+namespace skeleton_blocker {
 
 /** 
  * \brief Concept for template class of  Skeleton_blocker_geometric_complex .
@@ -68,7 +68,10 @@ struct SkeletonBlockerGeometricDS : public SkeletonBlockerDS
 	};
 };
 
-}  // namespace skbl
-}  // namespace GUDHI
+}  // namespace skeleton_blocker
+
+namespace skbl = skeleton_blocker;
+
+}  // namespace Gudhi
 
 #endif /* GUDHI_SKELETONBLOCKERGEOMETRICDS_H_ */