From 58f72ee2d7d869fd7e66a342c955e872fd0c5e73 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 18 Jan 2002 22:34:07 +0000
Subject: [PATCH] Changes to fix compilation problems on the Sparc.

GeoSet.cpp simply remove rendundent code that had already been commented out.
---
 include/osg/ImpostorSprite | 2 +-
 include/osg/Math           | 7 -------
 include/osg/Node           | 2 +-
 include/osg/Vec2           | 3 +--
 include/osg/Vec3           | 3 +--
 include/osg/Vec4           | 3 +--
 src/osg/GeoSet.cpp         | 5 -----
 7 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/include/osg/ImpostorSprite b/include/osg/ImpostorSprite
index df205398a..bbe8e7a2f 100644
--- a/include/osg/ImpostorSprite
+++ b/include/osg/ImpostorSprite
@@ -124,7 +124,7 @@ class SG_EXPORT ImpostorSprite : public Drawable
 
         Impostor* _parent;
 
-        friend ImpostorSpriteManager;
+        friend class osg::ImpostorSpriteManager;
 
         // support for a double linked list managed by the
         // ImposotorSpriteManager.
diff --git a/include/osg/Math b/include/osg/Math
index a7adcac28..dda12c117 100644
--- a/include/osg/Math
+++ b/include/osg/Math
@@ -75,19 +75,12 @@ inline double RadiansToDegrees(double angle) { return angle*180.0/M_PI; }
 #if defined(WIN32) && !defined(__CYGWIN__)
     inline bool isNaN(float v) { return _isnan(v)!=0; }
     inline bool isNaN(double v) { return _isnan(v)!=0; }
-    inline bool isInfinite(float v) { return !_finite(v); }
-    inline bool isInfinite(double v) { return !_finite(v); }
 #elif __sgi
     inline bool isNaN(float v) { return isnan(v); }
     inline bool isNaN(double v) { return isnan(v); }
-    // can't find a function to test for infiniting on sgi yet..
-    inline bool isInfinite(float v) { return false; }
-    inline bool isInfinite(double v) { return false; }
 #else
     inline bool isNaN(float v) { return isnan(v); }
     inline bool isNaN(double v) { return isnan(v); }
-    inline bool isInfinite(float v) { return isinf(v); }
-    inline bool isInfinite(double v) { return isinf(v); }
 #endif
 
 };
diff --git a/include/osg/Node b/include/osg/Node
index b0362001b..10e30739a 100644
--- a/include/osg/Node
+++ b/include/osg/Node
@@ -204,7 +204,7 @@ class SG_EXPORT Node : public Object
         std::string _name;
 
         ParentList _parents;
-        friend Group;
+        friend class osg::Group;
 
         ref_ptr<NodeCallback> _appCallback;
         int _numChildrenRequiringAppTraversal;
diff --git a/include/osg/Vec2 b/include/osg/Vec2
index 269a64446..79b18a270 100644
--- a/include/osg/Vec2
+++ b/include/osg/Vec2
@@ -52,9 +52,8 @@ class Vec2
         inline const float x() const { return _v[0]; }
         inline const float y() const { return _v[1]; }
 
-        inline const bool valid() const { return !isNaN() && !isInfinite(); }
+        inline const bool valid() const { return !isNaN(); }
         inline const bool isNaN() const { return osg::isNaN(_v[0]) || osg::isNaN(_v[1]); }
-        inline const bool isInfinite() const { return osg::isInfinite(_v[0]) || osg::isInfinite(_v[1]); }
 
         /// dot product
         inline const float operator * (const Vec2& rhs) const
diff --git a/include/osg/Vec3 b/include/osg/Vec3
index 188aea66b..932d0eb7b 100644
--- a/include/osg/Vec3
+++ b/include/osg/Vec3
@@ -58,9 +58,8 @@ class Vec3
         inline const float y() const { return _v[1]; }
         inline const float z() const { return _v[2]; }
 
-        inline const bool valid() const { return !isNaN() && !isInfinite(); }
+        inline const bool valid() const { return !isNaN(); }
         inline const bool isNaN() const { return osg::isNaN(_v[0]) || osg::isNaN(_v[1]) || osg::isNaN(_v[2]); }
-        inline const bool isInfinite() const { return osg::isInfinite(_v[0]) || osg::isInfinite(_v[1]) || osg::isInfinite(_v[2]); }
 
         /// dot product
         inline float operator * (const Vec3& rhs) const
diff --git a/include/osg/Vec4 b/include/osg/Vec4
index eb7d92554..f81109c56 100644
--- a/include/osg/Vec4
+++ b/include/osg/Vec4
@@ -67,9 +67,8 @@ class Vec4
         inline float z() const { return _v[2]; }
         inline float w() const { return _v[3]; }
 
-        inline const bool valid() const { return !isNaN() && !isInfinite(); }
+        inline const bool valid() const { return !isNaN(); }
         inline const bool isNaN() const { return osg::isNaN(_v[0]) || osg::isNaN(_v[1]) || osg::isNaN(_v[2]) || osg::isNaN(_v[3]); }
-        inline const bool isInfinite() const { return osg::isInfinite(_v[0]) || osg::isInfinite(_v[1]) || osg::isInfinite(_v[2]) || osg::isInfinite(_v[3]); }
 
         /// dot product
         inline float operator * (const Vec4& rhs) const
diff --git a/src/osg/GeoSet.cpp b/src/osg/GeoSet.cpp
index ead521ae8..9455698e6 100644
--- a/src/osg/GeoSet.cpp
+++ b/src/osg/GeoSet.cpp
@@ -47,11 +47,6 @@ GeoSet::GeoSet()
 
     _fast_path = 1;
 
-    //     cout << endl << "Above allocated"<<endl;
-    //     newMemoryAdapter<Vec3>* ma = newMemoryAdapter<Vec3>::instance();
-    //     mem_ptr<Vec3> coords(ma->allocate(100),ma);
-    //     cout << "Registered"<<endl;mc
-
 }
 
 #define INDEX_ARRAY_DELETE(A) if (A._is_ushort) ushortList.insert(A._ptr._ushort); else uintList.insert(A._ptr._uint);