Fixes for IRIX build.

src/osg/MemoryManager.cpp

@@ -699,8 +699,8 @@ void    *operator new(size_t reportedSize) throw (std::bad_alloc)
         // There isn't a way to determine the new handler, except through setting it. So we'll just set it to NULL, then
         // set it back again.
 
-        new_handler    nh = set_new_handler(0);
-        set_new_handler(nh);
+        std::new_handler    nh = std::set_new_handler(0);
+        std::set_new_handler(nh);
 
         // If there is an error handler, call it
 
@@ -751,8 +751,8 @@ void    *operator new[](size_t reportedSize) throw (std::bad_alloc)
         // There isn't a way to determine the new handler, except through setting it. So we'll just set it to NULL, then
         // set it back again.
 
-        new_handler    nh = set_new_handler(0);
-        set_new_handler(nh);
+        std::new_handler    nh = std::set_new_handler(0);
+        std::set_new_handler(nh);
 
         // If there is an error handler, call it
 
@@ -809,8 +809,8 @@ void    *operator new(size_t reportedSize, const char *sourceFile, int sourceLin
         // There isn't a way to determine the new handler, except through setting it. So we'll just set it to NULL, then
         // set it back again.
 
-        new_handler    nh = set_new_handler(0);
-        set_new_handler(nh);
+        std::new_handler    nh = std::set_new_handler(0);
+        std::set_new_handler(nh);
 
         // If there is an error handler, call it
 
@@ -861,8 +861,8 @@ void    *operator new[](size_t reportedSize, const char *sourceFile, int sourceL
         // There isn't a way to determine the new handler, except through setting it. So we'll just set it to NULL, then
         // set it back again.
 
-        new_handler    nh = set_new_handler(0);
-        set_new_handler(nh);
+        std::new_handler    nh = std::set_new_handler(0);
+        std::set_new_handler(nh);
 
         // If there is an error handler, call it
 

src/osgUtil/SceneView.cpp

@@ -66,7 +66,7 @@ void SceneView::setDefaults()
     _renderStage = osgNew RenderStage;
 
 
-//#ifndef __sgi
+#ifndef __sgi
     // sgi's IR graphics has a problem with lighting and display lists, as it seems to store 
     // lighting state with the display list, and the display list visitor doesn't currently apply
     // state before creating display lists. So will disable the init visitor default, this won't
@@ -75,7 +75,7 @@ void SceneView::setDefaults()
     dlv->setState(_state.get());
     dlv->setNodeMaskOverride(0xffffffff);
     _initVisitor = dlv;
-//#endif
+#endif
 
     _appVisitor = osgNew AppVisitor;