FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added #include<algorithm> to keep OSX build compiling.

Browse Source 
Reverted the mymax implementation to std::max, hopefully this should be ok now
that we have standardised on non native STL under VisualStudio.
This commit is contained in:
Robert Osfield
2003-02-21 20:22:32 +00:00
parent 3b429134cb
commit 696c89e2c5
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/ApplicationUsage.cpp
View File

@@ -1,5 +1,7 @@
#include <osg/ApplicationUsage>
#include <algorithm>
using namespace osg;
ApplicationUsage::ApplicationUsage(const std::string& commandLineUsage):

21
src/osg/State.cpp
View File

@@ -198,12 +198,13 @@ void State::captureCurrentState(StateSet& stateset) const
}
// visual studio 6.0 doesn't appear to define std::max?!? So do our own here..
template<class T>
T mymax(const T& a,const T& b)
{
return (((a) > (b)) ? (a) : (b));
}
// revert to using std::max for consistency, std::max should be defined by STLport on VS.
// // visual studio 6.0 doesn't appear to define std::max?!? So do our own here..
// template<class T>
// T mymax(const T& a,const T& b)
// {
// return (((a) > (b)) ? (a) : (b));
// }
void State::apply(const StateSet* dstate)
{
@@ -224,9 +225,9 @@ void State::apply(const StateSet* dstate)
const StateSet::TextureAttributeList& ds_textureAttributeList = dstate->getTextureAttributeList();
unsigned int unit;
unsigned int unitMax = mymax(static_cast<unsigned int>(ds_textureModeList.size()),static_cast<unsigned int>(ds_textureAttributeList.size()));
unitMax = mymax(static_cast<unsigned int>(unitMax),static_cast<unsigned int>(_textureModeMapList.size()));
unitMax = mymax(static_cast<unsigned int>(unitMax),static_cast<unsigned int>(_textureAttributeMapList.size()));
unsigned int unitMax = std::max(static_cast<unsigned int>(ds_textureModeList.size()),static_cast<unsigned int>(ds_textureAttributeList.size()));
unitMax = std::max(static_cast<unsigned int>(unitMax),static_cast<unsigned int>(_textureModeMapList.size()));
unitMax = std::max(static_cast<unsigned int>(unitMax),static_cast<unsigned int>(_textureAttributeMapList.size()));
for(unit=0;unit<unitMax;++unit)
{
if (setActiveTextureUnit(unit))
@@ -261,7 +262,7 @@ void State::apply()
applyAttributeMap(_attributeMap);
unsigned int unit;
unsigned int unitMax = mymax(_textureModeMapList.size(),_textureAttributeMapList.size());
unsigned int unitMax = std::max(_textureModeMapList.size(),_textureAttributeMapList.size());
for(unit=0;unit<unitMax;++unit)
{
if (setActiveTextureUnit(unit))