diff options
author | cjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-08-04 15:07:49 +0000 |
---|---|---|
committer | cjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-08-04 15:07:49 +0000 |
commit | 992b082d31273e217ec19d9c579883bb3fab10d3 (patch) | |
tree | d76573a819a45f89f2b5d92573cefaa97cd76390 /src/Skeleton_blocker/concept | |
parent | 2455525b1583b7a7b4c38d0637a1e0507cf5181d (diff) | |
parent | d5c5c59161b724f93999c78d979c555b9a72d1ec (diff) |
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
Diffstat (limited to 'src/Skeleton_blocker/concept')
-rw-r--r-- | src/Skeleton_blocker/concept/SkeletonBlockerDS.h | 9 | ||||
-rw-r--r-- | src/Skeleton_blocker/concept/SkeletonBlockerGeometricDS.h | 9 |
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_ */ |