From e1eaeced8cc8de0019cd42704f7e44d2246e6e74 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 4 Feb 2016 19:38:23 +0000 Subject: [PATCH] From Laurens Voerman, "While compiling with Visual Studio 12 (aka 2013 update 3) I get a these errors: E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(364): error C2039: 'min' : is not a member of 'std' E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(364): error C3861: 'min': identifier not found E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(372): error C2039: 'min' : is not a member of 'std' E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(372): error C3861: 'min': identifier not found E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(381): error C2039: 'min' : is not a member of 'std' E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(381): error C3861: 'min': identifier not found E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(436): error C2039: 'min' : is not a member of 'std' E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(436): error C3861: 'min': identifier not found I suggest to replace std::min by osg::minimum, attached is a (zipped) modified version of src/osg/PrimitiveSet.cpp applies to the git reposetory only (updated 1 Feb 2016 ae6bade641ee4d8436ef69e7a7a347be81195a47 ) " --- src/osg/PrimitiveSet.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osg/PrimitiveSet.cpp b/src/osg/PrimitiveSet.cpp index acb8a16d4..31edf53ac 100644 --- a/src/osg/PrimitiveSet.cpp +++ b/src/osg/PrimitiveSet.cpp @@ -361,7 +361,7 @@ void MultiDrawArrays::draw(osg::State& state, bool) const GLExtensions* ext = state.get(); if (ext->glMultiDrawArrays) { - GLsizei primcount = std::min(_firsts.size(), _counts.size()); + GLsizei primcount = osg::minimum(_firsts.size(), _counts.size()); ext->glMultiDrawArrays(_mode, &_firsts.front(), &_counts.front(), primcount); } @@ -369,7 +369,7 @@ void MultiDrawArrays::draw(osg::State& state, bool) const void MultiDrawArrays::accept(PrimitiveFunctor& functor) const { - unsigned int primcount = std::min(_firsts.size(), _counts.size()); + unsigned int primcount = osg::minimum(_firsts.size(), _counts.size()); for(unsigned int i=0; i