From cd3c2c0b777bc51ec0cc10ae505265d46a513fd3 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 11 Jul 2002 11:36:25 +0000
Subject: [PATCH] Fixes for Win32 build

---
 include/osg/Primitive |  8 ++++----
 src/osg/State.cpp     | 14 ++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/include/osg/Primitive b/include/osg/Primitive
index 5ce234339..6e4ef4538 100644
--- a/include/osg/Primitive
+++ b/include/osg/Primitive
@@ -34,7 +34,7 @@ public:
 	VectorSizei(): inherited() {}
 	explicit VectorSizei(size_type n): inherited(n) {}
 	VectorSizei(const VectorSizei &copy): inherited(copy) {}
-	VectorSizei(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
+	//VectorSizei(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
 	template<class InputIterator>
 	VectorSizei(InputIterator beg_, InputIterator end_): inherited(beg_, end_) {}
 };
@@ -45,7 +45,7 @@ public:
 	VectorUByte(): inherited() {}
 	explicit VectorUByte(size_type n): inherited(n) {}
 	VectorUByte(const VectorUByte &copy): inherited(copy) {}
-	VectorUByte(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
+	//VectorUByte(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
 	template<class InputIterator>
 	VectorUByte(InputIterator beg_, InputIterator end_): inherited(beg_, end_) {}
 };
@@ -56,7 +56,7 @@ public:
 	VectorUShort(): inherited() {}
 	explicit VectorUShort(size_type n): inherited(n) {}
 	VectorUShort(const VectorUShort &copy): inherited(copy) {}
-	VectorUShort(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
+	//VectorUShort(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
 	template<class InputIterator>
 	VectorUShort(InputIterator beg_, InputIterator end_): inherited(beg_, end_) {}
 };
@@ -67,7 +67,7 @@ public:
 	VectorUInt(): inherited() {}
 	explicit VectorUInt(size_type n): inherited(n) {}
 	VectorUInt(const VectorUInt &copy): inherited(copy) {}
-	VectorUInt(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
+	//VectorUInt(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
 	template<class InputIterator>
 	VectorUInt(InputIterator beg_, InputIterator end_): inherited(beg_, end_) {}
 };
diff --git a/src/osg/State.cpp b/src/osg/State.cpp
index 7418e7de9..8e73bf66a 100644
--- a/src/osg/State.cpp
+++ b/src/osg/State.cpp
@@ -172,6 +172,12 @@ 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));
+}
 
 void State::apply(const StateSet* dstate)
 {
@@ -190,9 +196,9 @@ void State::apply(const StateSet* dstate)
         const StateSet::TextureAttributeList& ds_textureAttributeList = dstate->getTextureAttributeList();
 
         unsigned int unit;
-        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()));
+        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()));
         for(unit=0;unit<unitMax;++unit)
         {
             if (setActiveTextureUnit(unit))
@@ -225,7 +231,7 @@ void State::apply()
     applyAttributeMap(_attributeMap);
        
     unsigned int unit;
-    unsigned int unitMax = std::max(_textureModeMapList.size(),_textureAttributeMapList.size());
+    unsigned int unitMax = mymax(_textureModeMapList.size(),_textureAttributeMapList.size());
     for(unit=0;unit<unitMax;++unit)
     {
         if (setActiveTextureUnit(unit))