From 7c90800822153e0e2b63ce08a5c5588e14d8cf00 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 12 May 2005 20:35:15 +0000
Subject: [PATCH] From Jan Ciger, gcc 4.0 compile fix.

---
 include/osg/State | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/osg/State b/include/osg/State
index 236a3354b..25f9c3b2b 100644
--- a/include/osg/State
+++ b/include/osg/State
@@ -622,7 +622,7 @@ class OSG_EXPORT State : public Referenced
 
 
         /** Set the current texture unit, return true if selected,
-		  * false if selection failed such as when multitexturing is not supported.
+          * false if selection failed such as when multitexturing is not supported.
           * note, only updates values that change.*/
         bool setActiveTextureUnit( unsigned int unit );
         
@@ -630,7 +630,7 @@ class OSG_EXPORT State : public Referenced
         unsigned int getActiveTextureUnit() const { return _currentActiveTextureUnit; }
 
         /** Set the current tex coord array texture unit, return true if selected,
-		  * false if selection failed such as when multitexturing is not supported.
+          * false if selection failed such as when multitexturing is not supported.
           * note, only updates values that change.*/
         bool setClientActiveTextureUnit( unsigned int unit );
 
@@ -666,8 +666,8 @@ class OSG_EXPORT State : public Referenced
         void setLastAppliedProgramObject(const Program::PerContextProgram* program) { if (_lastAppliedProgramObject!=program) { _lastAppliedProgramObject = program; if (program) _appliedProgramObjectSet.insert(program); } }
         const Program::PerContextProgram* getLastAppliedProgramObject() const { return _lastAppliedProgramObject; }
 
-	inline GLint getUniformLocation( const std::string& name ) const { return _lastAppliedProgramObject ? _lastAppliedProgramObject->getUniformLocation(name) : -1; }
-	inline GLint getAttribLocation( const std::string& name ) const { return _lastAppliedProgramObject ? _lastAppliedProgramObject->getAttribLocation(name) : -1; }
+        inline GLint getUniformLocation( const std::string& name ) const { return _lastAppliedProgramObject ? _lastAppliedProgramObject->getUniformLocation(name) : -1; }
+        inline GLint getAttribLocation( const std::string& name ) const { return _lastAppliedProgramObject ? _lastAppliedProgramObject->getAttribLocation(name) : -1; }
 
         /** Set the current OpenGL context uniqueID.
             Note, it is the application developers responsibility to
@@ -772,7 +772,7 @@ class OSG_EXPORT State : public Referenced
 
         struct AttributeStack
         {
-            typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue>  AttributeStack::AttributePair;
+            typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue>  AttributePair;
             typedef std::vector<AttributePair>                                      AttributeVec;
 
             AttributeStack()