Fixes for IRIX build

examples/osgfxbrowser/osgfxbrowser.cpp

@@ -93,7 +93,7 @@ public:
 	};
 
 	EffectPanel()
-	:	Frame(),
+	:	osgfxbrowser::Frame(),
 		selected_fx_(-1),
 		fxen_(true),
 		root_(new osg::Group),

examples/osglauncher/osglauncher.cpp

@@ -1,5 +1,5 @@
-#include <cstdio>
-#include <cstdlib>
+//#include <cstdio>
+//#include <cstdlib>
 #include <iostream>
 #include <list>
 #include <string>

include/osgDB/ImageOptions

@@ -27,7 +27,7 @@ class OSGDB_EXPORT ImageOptions : public osgDB::ReaderWriter::Options
         ImageOptions(const std::string& str);
             
         ImageOptions(const ImageOptions& options,const osg::CopyOp copyop=osg::CopyOp::SHALLOW_COPY):
-            Options(options,copyop),
+            osgDB::ReaderWriter::Options(options,copyop),
             _sourceImageSamplingMode(options._sourceImageSamplingMode),
             _sourceImageWindowMode(options._sourceImageWindowMode),
             _sourceRatioWindow(options._sourceRatioWindow),

include/osgDB/ReaderWriter

@@ -37,7 +37,8 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object
     
     
         ReaderWriter() {}
-        ReaderWriter(const ReaderWriter& rw,const osg::CopyOp copyop=osg::CopyOp::SHALLOW_COPY):Object(rw,copyop) {}
+        ReaderWriter(const ReaderWriter& rw,const osg::CopyOp copyop=osg::CopyOp::SHALLOW_COPY):
+            osg::Object(rw,copyop) {}
 
         virtual ~ReaderWriter();
 
@@ -84,7 +85,7 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object
                 Options(const std::string& str):_str(str) {}
                 
                 Options(const Options& options,const osg::CopyOp copyop=osg::CopyOp::SHALLOW_COPY):
-                    Object(options,copyop),
+                    osg::Object(options,copyop),
                     _str(options._str),
                     _databasePaths(options._databasePaths),
                     _objectCacheHint(options._objectCacheHint) {}

include/osgDB/ReentrantMutex

@@ -37,7 +37,7 @@ class OSGDB_EXPORT ReentrantMutex : public OpenThreads::Mutex
 
     private:
 
-        ReentrantMutex(const ReentrantMutex &):Mutex() {}
+        ReentrantMutex(const ReentrantMutex &):OpenThreads::Mutex() {}
 
         ReentrantMutex &operator=(const ReentrantMutex &) {return *(this);}
         

src/osgDB/ReentrantMutex.cpp

@@ -35,7 +35,7 @@ int ReentrantMutex::lock()
     }
     else
     {
-        int result = Mutex::lock();
+        int result = OpenThreads::Mutex::lock();
         if (result==0)
         {
             _threadHoldingMutex = OpenThreads::Thread::CurrentThread();
@@ -50,7 +50,7 @@ int ReentrantMutex::unlock()
     if (_threadHoldingMutex==OpenThreads::Thread::CurrentThread() && _lockCount>0)
     {
         --_lockCount;
-        if (_lockCount<=0) return Mutex::unlock();
+        if (_lockCount<=0) return OpenThreads::Mutex::unlock();
     }
     return 0;
 }
@@ -64,7 +64,7 @@ int ReentrantMutex::trylock()
     }
     else
     {
-        int result = Mutex::trylock();
+        int result = OpenThreads::Mutex::trylock();
         if (result==0)
         {
             _threadHoldingMutex = OpenThreads::Thread::CurrentThread();

src/osgPlugins/flt/ReaderWriterFLT.cpp

@@ -57,9 +57,9 @@ osgDB::ReaderWriter::ReadResult ReaderWriterFLT::readNode(const std::string& fil
         
     }
 
-    osg::ref_ptr<ReaderWriter::Options> local_options = options ? 
-                static_cast<ReaderWriter::Options*>(options->clone(osg::CopyOp(osg::CopyOp::SHALLOW_COPY))) : 
-                new ReaderWriter::Options;
+    osg::ref_ptr<osgDB::ReaderWriter::Options> local_options = options ? 
+                static_cast<osgDB::ReaderWriter::Options*>(options->clone(osg::CopyOp(osg::CopyOp::SHALLOW_COPY))) : 
+                new osgDB::ReaderWriter::Options;
     local_options->setDatabasePath(osgDB::getFilePath(fileName));
     read->setOptions(local_options.get());
 

src/osgPlugins/net/sockinet.cpp

@@ -163,7 +163,11 @@ sockinetaddr sockinetbuf::localaddr() const
 {
   sockinetaddr sin;
   int len = sin.size();
+#ifdef __sgi
+  if (::getsockname(rep->sock, sin.addr (), (int *) // LN
+#else
   if (::getsockname(rep->sock, sin.addr (), (socklen_t*) // LN
+#endif
                     &len) == -1)
     throw sockerr (errno, "sockinetbuf::localaddr");
   return sin;
@@ -187,7 +191,11 @@ sockinetaddr sockinetbuf::peeraddr() const
 {
   sockinetaddr sin;
   int len = sin.size();
+#ifdef __sgi
+  if (::getpeername(rep->sock, sin.addr (), (int *) // LN
+#else
   if (::getpeername(rep->sock, sin.addr (), (socklen_t*) // LN
+#endif
                     &len) == -1)
     throw sockerr (errno, "sockinetbuf::peeraddr");
   return sin;

src/osgPlugins/net/sockstream.cpp

@@ -63,6 +63,7 @@
 #include "sockstream.h"
 #include <sstream>
 #include <string>
+
 #if defined(__APPLE__) 
 typedef int socklen_t;
 #endif
@@ -128,6 +129,10 @@ extern "C" {
 #include <sys/filio.h>
 #endif
 
+#ifdef __sgi
+#define socklen_t int
+#endif
+
 #ifndef BUFSIZ
 #  define BUFSIZ 1024
 #endif

src/osgPlugins/net/sockstream.h

@@ -54,9 +54,6 @@
 #endif
 #endif
 
-#ifdef __sgi
-typedef int socklen_t;
-#endif
 
 using namespace std;