diff options
| author | salinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-26 15:30:06 +0000 |
|---|---|---|
| committer | salinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-26 15:30:06 +0000 |
| commit | b657d6773daa77149d3bd53648d414cc6c48dbae (patch) | |
| tree | a2fe1c1859a5bc0a899f791cb4cb3e15ac95dd7a /src/Skeleton_blocker | |
| parent | 6b5cb7d8b2dc3c065eafc7a475be55319722ef09 (diff) | |
skbl vs2013 compatibilty
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@421 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 6d37dd359ef37e8338da1f4cda9ef44faecbc13d
Diffstat (limited to 'src/Skeleton_blocker')
| -rw-r--r-- | src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simplex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simplex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simplex.h index be997b6b..717b6052 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simplex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simplex.h @@ -141,7 +141,7 @@ class Skeleton_blocker_simplex { */ void intersection(const Skeleton_blocker_simplex & a) { std::vector<T> v; - v.reserve(std::min(simplex_set.size(), a.simplex_set.size())); + v.reserve((std::min)(simplex_set.size(), a.simplex_set.size())); set_intersection(simplex_set.begin(), simplex_set.end(), a.simplex_set.begin(), a.simplex_set.end(), |