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/concept | |
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/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_ */ |