From 8f1284d8bc1a639cde84d409b3744da57f87ad20 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 4 Nov 2010 11:39:47 +0000 Subject: [PATCH] From Sukender, "I replaced std::min() with osg::minimum() in RandomRateCounter, to avoid including the STL header (Or else it doesn't compile under MSVC 10)." --- include/osgParticle/RandomRateCounter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/osgParticle/RandomRateCounter b/include/osgParticle/RandomRateCounter index 96d211929..f4d4d0946 100644 --- a/include/osgParticle/RandomRateCounter +++ b/include/osgParticle/RandomRateCounter @@ -54,7 +54,7 @@ namespace osgParticle inline int RandomRateCounter::numParticlesToCreate(double dt) const { // compute the number of new particles, clamping it to 1 second of particles at the maximum rate - float numNewParticles = std::min(static_cast(dt * getRateRange().get_random()), getRateRange().maximum); + float numNewParticles = osg::minimum(static_cast(dt * getRateRange().get_random()), getRateRange().maximum); // add the number of new particles to value carried over from the previous call _np += numNewParticles;