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

---
 include/osg/State                             | 42 ++---------------
 src/Demos/osgcluster/osgcluster.cpp           |  2 +-
 src/Demos/osgmultitexture/osgmultitexture.cpp |  2 +-
 src/osg/State.cpp                             | 45 +++++++++++++++++++
 4 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/include/osg/State b/include/osg/State
index 40bd0283f..9bd12b1b0 100644
--- a/include/osg/State
+++ b/include/osg/State
@@ -24,6 +24,7 @@ namespace osg {
 #define GL_TEXTURE0 0x84C0
 #endif
 
+
 /** macro for use with osg::StateAttrbiute::apply methods for detected and 
   * reporting OpenGL error messages.*/
 #define OSG_GL_DEBUG(message) \
@@ -358,48 +359,12 @@ class SG_EXPORT State : public Referenced
 
         /** set the current tex coord array texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
           * note, only updates values that change.*/
-        inline bool setClientActiveTextureUnit( unsigned int unit )
-        {
-            if (unit!=_currentClientActiveTextureUnit)
-            {
-                static ActiveTextureProc s_glClientActiveTexture =  
-                        (ActiveTextureProc) osg::getGLExtensionFuncPtr("glClientActiveTexture","glClientActiveTextureARB");
-
-                if (s_glClientActiveTexture)
-                {
-                    s_glClientActiveTexture(GL_TEXTURE0+unit);
-                    _currentClientActiveTextureUnit = unit;
-                }
-                else
-                {
-                    return unit==0;
-                }
-            }
-            return true;
-        }
+        bool setClientActiveTextureUnit( unsigned int unit );
 
 
         /** set the current texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
           * note, only updates values that change.*/
-        inline bool setActiveTextureUnit( unsigned int unit )
-        {
-            if (unit!=_currentActiveTextureUnit)
-            {
-                static ActiveTextureProc s_glActiveTexture =  
-                       (ActiveTextureProc) osg::getGLExtensionFuncPtr("glActiveTexture","glActiveTextureARB");
-
-                if (s_glActiveTexture)
-                {
-                    s_glActiveTexture(GL_TEXTURE0+unit);
-                    _currentActiveTextureUnit = unit;
-                }
-                else
-                {
-                    return unit==0;
-                }
-            }
-            return true;
-        }
+        bool setActiveTextureUnit( unsigned int unit );
         
 
         
@@ -523,7 +488,6 @@ class SG_EXPORT State : public Referenced
                 return false;
         }
         
-        typedef void (APIENTRY * ActiveTextureProc) (GLenum texture);
 
         typedef std::map<StateAttribute::GLMode,ModeStack>      ModeMap;
         typedef std::vector<ModeMap>                            TextureModeMapList;
diff --git a/src/Demos/osgcluster/osgcluster.cpp b/src/Demos/osgcluster/osgcluster.cpp
index 0b66cc3b9..91f4c9003 100644
--- a/src/Demos/osgcluster/osgcluster.cpp
+++ b/src/Demos/osgcluster/osgcluster.cpp
@@ -163,7 +163,7 @@ class MySceneView : public osgUtil::SceneView {
         // override the basic SceneView::app traversal.
         virtual void app()
         {
-            osgUtil::SceneView::app();
+            SceneView::app();
             switch (_viewerMode)
             {
             case(MASTER):
diff --git a/src/Demos/osgmultitexture/osgmultitexture.cpp b/src/Demos/osgmultitexture/osgmultitexture.cpp
index ef54ba41a..98154dd9b 100644
--- a/src/Demos/osgmultitexture/osgmultitexture.cpp
+++ b/src/Demos/osgmultitexture/osgmultitexture.cpp
@@ -108,7 +108,7 @@ int main( int argc, char **argv )
     }
     else
     {
-        notify(osg::NOTICE)<<"unable to load reflect map, model will not be mutlitextured"<<endl;
+		osg::notify(osg::NOTICE)<<"unable to load reflect map, model will not be mutlitextured"<<std::endl;
     }
 
 
diff --git a/src/osg/State.cpp b/src/osg/State.cpp
index 8e73bf66a..affc361de 100644
--- a/src/osg/State.cpp
+++ b/src/osg/State.cpp
@@ -392,3 +392,48 @@ Polytope State::getViewFrustum() const
     cv.transformProvidingInverse((*_modelView)*(*_projection));
     return cv;
 }
+
+typedef void (APIENTRY * ActiveTextureProc) (GLenum texture);
+
+bool State::setClientActiveTextureUnit( unsigned int unit )
+{
+    if (unit!=_currentClientActiveTextureUnit)
+    {
+        static ActiveTextureProc s_glClientActiveTexture =  
+                (ActiveTextureProc) osg::getGLExtensionFuncPtr("glClientActiveTexture","glClientActiveTextureARB");
+
+        if (s_glClientActiveTexture)
+        {
+            s_glClientActiveTexture(GL_TEXTURE0+unit);
+            _currentClientActiveTextureUnit = unit;
+        }
+        else
+        {
+            return unit==0;
+        }
+    }
+    return true;
+}
+
+
+/** set the current texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
+  * note, only updates values that change.*/
+bool State::setActiveTextureUnit( unsigned int unit )
+{
+    if (unit!=_currentActiveTextureUnit)
+    {
+        static ActiveTextureProc s_glActiveTexture =  
+               (ActiveTextureProc) osg::getGLExtensionFuncPtr("glActiveTexture","glActiveTextureARB");
+
+        if (s_glActiveTexture)
+        {
+            s_glActiveTexture(GL_TEXTURE0+unit);
+            _currentActiveTextureUnit = unit;
+        }
+        else
+        {
+            return unit==0;
+        }
+    }
+    return true;
+}