From b657d6773daa77149d3bd53648d414cc6c48dbae Mon Sep 17 00:00:00 2001 From: salinasd Date: Mon, 26 Jan 2015 15:30:06 +0000 Subject: 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 --- .../include/gudhi/Skeleton_blocker/Skeleton_blocker_simplex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Skeleton_blocker') 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 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(), -- cgit v1.2.3