From 9a5ab0ac47c9a20bb1ac49b0d70213367e16f933 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 3 Sep 2003 08:14:00 +0000
Subject: [PATCH] Fixes for IRIX build.

---
 include/osgSim/SphereSegment |  6 +++---
 src/osgSim/SphereSegment.cpp | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/osgSim/SphereSegment b/include/osgSim/SphereSegment
index 688af4862..90d719db3 100644
--- a/include/osgSim/SphereSegment
+++ b/include/osgSim/SphereSegment
@@ -76,7 +76,7 @@ public:
 
 
     /** Default constructor. */
-    SphereSegment():Geode(),
+    SphereSegment():osg::Geode(),
                     _centre(0.0f,0.0f,0.0f), _radius(1.0f),
                     _azMin(0.0f), _azMax(osg::PI/2.0f),
                     _elevMin(0.0f), _elevMax(osg::PI/2.0f),
@@ -99,7 +99,7 @@ public:
     */
     SphereSegment(const osg::Vec3& centre, float radius, float azMin, float azMax,
                     float elevMin, float elevMax, int density):
-        Geode(),
+        osg::Geode(),
         _centre(centre), _radius(radius),
         _azMin(azMin), _azMax(azMax),
         _elevMin(elevMin), _elevMax(elevMax),
@@ -124,7 +124,7 @@ public:
 
     /** Copy constructor */
     SphereSegment(const SphereSegment& rhs, const osg::CopyOp& co):
-        Geode(rhs,co),
+        osg::Geode(rhs,co),
         _centre(rhs._centre), _radius(rhs._radius),
         _azMin(rhs._azMin), _azMax(rhs._azMax),
         _elevMin(rhs._elevMin), _elevMax(rhs._elevMax),
diff --git a/src/osgSim/SphereSegment.cpp b/src/osgSim/SphereSegment.cpp
index 02b23c3f9..b74c3061a 100644
--- a/src/osgSim/SphereSegment.cpp
+++ b/src/osgSim/SphereSegment.cpp
@@ -13,7 +13,7 @@ sphere's surface.
 class SphereSegment::Surface: public osg::Drawable
 {
 public:
-    Surface(SphereSegment* ss): Drawable(), _ss(ss) {}
+    Surface(SphereSegment* ss): osg::Drawable(), _ss(ss) {}
 
     Surface():_ss(0)
     {
@@ -21,7 +21,7 @@ public:
             "Warning: unexpected call to osgSim::SphereSegment::Surface() default constructor"<<std::endl;
     }
 
-    Surface(const Surface& rhs, const osg::CopyOp& co=osg::CopyOp::SHALLOW_COPY):Drawable(rhs,co), _ss(0)
+    Surface(const Surface& rhs, const osg::CopyOp& co=osg::CopyOp::SHALLOW_COPY):osg::Drawable(rhs,co), _ss(0)
     {
         osg::notify(osg::WARN)<<
             "Warning: unexpected call to osgSim::SphereSegment::Surface() copy constructor"<<std::endl;
@@ -59,7 +59,7 @@ of the specified area of the sphere's EdgeLine.
 class SphereSegment::EdgeLine: public osg::Drawable
 {
 public:
-    EdgeLine(SphereSegment* ss): Drawable(), _ss(ss) {}
+    EdgeLine(SphereSegment* ss): osg::Drawable(), _ss(ss) {}
 
     EdgeLine():_ss(0)
     {
@@ -67,7 +67,7 @@ public:
             "Warning: unexpected call to osgSim::SphereSegment::EdgeLine() default constructor"<<std::endl;
     }
 
-    EdgeLine(const EdgeLine& rhs, const osg::CopyOp& co=osg::CopyOp::SHALLOW_COPY):Drawable(rhs,co), _ss(0)
+    EdgeLine(const EdgeLine& rhs, const osg::CopyOp& co=osg::CopyOp::SHALLOW_COPY):osg::Drawable(rhs,co), _ss(0)
     {
         osg::notify(osg::WARN)<<
             "Warning: unexpected call to osgSim::SphereSegment::EdgeLine() copy constructor"<<std::endl;
@@ -107,7 +107,7 @@ class SphereSegment::Side: public osg::Drawable
 {
 public:
     Side(SphereSegment* ss, SphereSegment::SideOrientation po, SphereSegment::BoundaryAngle pa):
-            Drawable(), _ss(ss), _planeOrientation(po), _BoundaryAngle(pa) {}
+            osg::Drawable(), _ss(ss), _planeOrientation(po), _BoundaryAngle(pa) {}
 
     Side():_ss(0)
     {
@@ -115,7 +115,7 @@ public:
             "Warning: unexpected call to osgSim::SphereSegment::Side() default constructor"<<std::endl;
     }
 
-    Side(const Side& rhs, const osg::CopyOp& co=osg:: CopyOp::SHALLOW_COPY): Drawable(rhs,co), _ss(0)
+    Side(const Side& rhs, const osg::CopyOp& co=osg:: CopyOp::SHALLOW_COPY): osg::Drawable(rhs,co), _ss(0)
     {
         osg::notify(osg::WARN)<<
             "Warning: unexpected call to osgSim::SphereSegment::Side() copy constructor"<<std::endl;
@@ -156,7 +156,7 @@ class SphereSegment::Spoke: public osg::Drawable
 {
 public:
     Spoke(SphereSegment* ss, SphereSegment::BoundaryAngle azAngle, SphereSegment::BoundaryAngle elevAngle):
-            Drawable(), _ss(ss), _azAngle(azAngle), _elevAngle(elevAngle) {}
+            osg::Drawable(), _ss(ss), _azAngle(azAngle), _elevAngle(elevAngle) {}
 
     Spoke():_ss(0)
     {
@@ -164,7 +164,7 @@ public:
             "Warning: unexpected call to osgSim::SphereSegment::Spoke() default constructor"<<std::endl;
     }
 
-    Spoke(const Spoke& rhs, const osg::CopyOp& co=osg:: CopyOp::SHALLOW_COPY): Drawable(rhs,co), _ss(0)
+    Spoke(const Spoke& rhs, const osg::CopyOp& co=osg:: CopyOp::SHALLOW_COPY): osg::Drawable(rhs,co), _ss(0)
     {
         osg::notify(osg::WARN)<<
             "Warning: unexpected call to osgSim::SphereSegment::Spoke() copy constructor"<<std::endl;