From 65fec633890f2cb1562c436b086d3ced2be1e107 Mon Sep 17 00:00:00 2001
From: Don BURNS <don@andesengineering.com>
Date: Fri, 22 Nov 2002 05:00:43 +0000
Subject: [PATCH] Fixes for IRIX build

---
 src/Demos/osgshadowtexture/CreateShadowedScene.cpp | 2 +-
 src/osgPlugins/ac3d/ac3d.cpp                       | 5 +++--
 src/osgSim/LightPointDrawable.cpp                  | 4 ++--
 src/osgSim/LightPointNode.cpp                      | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Demos/osgshadowtexture/CreateShadowedScene.cpp b/src/Demos/osgshadowtexture/CreateShadowedScene.cpp
index b7c8b1413..191f0a506 100644
--- a/src/Demos/osgshadowtexture/CreateShadowedScene.cpp
+++ b/src/Demos/osgshadowtexture/CreateShadowedScene.cpp
@@ -68,7 +68,7 @@ class CreateShadowTextureCullCallback : public osg::NodeCallback
                 {
                     glPushMatrix();
                     glLoadMatrixf(_matrix.ptr());
-                    TexGen::apply(state);
+                    osg::TexGen::apply(state);
                     glPopMatrix();
                 }
 
diff --git a/src/osgPlugins/ac3d/ac3d.cpp b/src/osgPlugins/ac3d/ac3d.cpp
index 22a9ae829..66fa07a31 100644
--- a/src/osgPlugins/ac3d/ac3d.cpp
+++ b/src/osgPlugins/ac3d/ac3d.cpp
@@ -452,8 +452,9 @@ osg::Group *ac_load_object(FILE *f,const ACObject *parent)
         else
         if (streq(t, "url"))
             {
-            if (get_tokens(buff, &tokc, tokv) != 2)
-                printf("expected one arg to url at line %d (got %d)\n", line, tokv);
+	    int ret;
+            if ((ret = get_tokens(buff, &tokc, tokv)) != 2)
+                printf("expected one arg to url at line %d (got %d)\n", line, ret); 
             else
                 ob.url = STRING(tokv[1]);
             }
diff --git a/src/osgSim/LightPointDrawable.cpp b/src/osgSim/LightPointDrawable.cpp
index 9d7270c80..b4a69f572 100644
--- a/src/osgSim/LightPointDrawable.cpp
+++ b/src/osgSim/LightPointDrawable.cpp
@@ -13,7 +13,7 @@
 using namespace osgSim;
 
 LightPointDrawable::LightPointDrawable():
-    Drawable(),
+    osg::Drawable(),
     _referenceTime(0.0),
     _referenceTimeInterval(0.0),
     _sizedLightPointList()
@@ -36,7 +36,7 @@ LightPointDrawable::LightPointDrawable():
 }
 
 LightPointDrawable::LightPointDrawable(const LightPointDrawable& lpd,const osg::CopyOp& copyop):
-    Drawable(lpd,copyop),
+    osg::Drawable(lpd,copyop),
     _referenceTime(lpd._referenceTime),
     _referenceTimeInterval(lpd._referenceTimeInterval),
     _sizedLightPointList(lpd._sizedLightPointList)
diff --git a/src/osgSim/LightPointNode.cpp b/src/osgSim/LightPointNode.cpp
index c186ee747..ec259c2a9 100644
--- a/src/osgSim/LightPointNode.cpp
+++ b/src/osgSim/LightPointNode.cpp
@@ -26,7 +26,7 @@ LightPointNode::LightPointNode()
 
 /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
 LightPointNode::LightPointNode(const LightPointNode& lpn,const osg::CopyOp& copyop):
-    Node(lpn,copyop),
+    osg::Node(lpn,copyop),
     _lightPointList(lpn._lightPointList)
 {
 }