Attempts to fix compile problems under IRIX due to namespace problems.

Make/makedirdefs

@@ -182,7 +182,7 @@ EXAMPLE_DIRS = \
 	osgversion\
 	osgvertexprogram\
 	osgviewer\
-	osgmovie\
+#	osgmovie\
 	osgwindows\
         
 #	osgpagedlod\

examples/osgdistortion/osgdistortion.cpp

@@ -24,6 +24,8 @@
 
 #include <osgProducer/Viewer>
 
+using namespace osg;
+
 class DistortionNode : public osg::Group
 {
 public:

examples/osgphotoalbum/ImageReaderWriter.cpp

@@ -108,7 +108,7 @@ osg::Image* ImageReaderWriter::readImage_DynamicSampling(DataReference& dr, floa
 osgDB::ReaderWriter::ReadResult ImageReaderWriter::readNode(const std::string& fileName, const Options*)
 {
     DataReferenceMap::iterator itr = _dataReferences.find(fileName);
-    if (itr==_dataReferences.end()) return ReaderWriter::ReadResult::FILE_NOT_HANDLED;
+    if (itr==_dataReferences.end()) return osgDB::ReaderWriter::ReadResult::FILE_NOT_HANDLED;
 
     DataReference& dr = itr->second;
 
@@ -216,7 +216,7 @@ osgDB::ReaderWriter::ReadResult ImageReaderWriter::readNode(const std::string& f
     }
     else
     {
-        return ReaderWriter::ReadResult::FILE_NOT_HANDLED;
+        return osgDB::ReaderWriter::ReadResult::FILE_NOT_HANDLED;
     }
 
 

examples/osgphotoalbum/osgphotoalbum.cpp

@@ -26,6 +26,8 @@
 
 #include "ImageReaderWriter.h"
 
+using namespace osg;
+
 // now register with Registry to instantiate the above reader/writer,
 // declaring in main so that the code to set up PagedLOD can get a handle
 // to the ImageReaderWriter's 

examples/osgscalarbar/osgscalarbar.cpp

@@ -24,6 +24,7 @@
 #include <math.h>
 
 using namespace osgSim;
+using osgSim::ScalarBar;
 
 osg::Node* createScalarBar()
 {

include/osgSim/DOFTransform

@@ -30,7 +30,7 @@ class OSGSIM_EXPORT DOFTransform : public osg::Transform
 
         /**copy constructor*/
         DOFTransform(const DOFTransform& dof, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
-            Transform(dof, copyop),
+            osg::Transform(dof, copyop),
             _minHPR(dof._minHPR),
             _maxHPR(dof._maxHPR),
             _currentHPR(dof._currentHPR),

src/osgPlugins/geo/osgGeoAnimation.h

@@ -36,7 +36,7 @@ public:
 		uvarupdate=NULL; extvarupdate=NULL;
 	};
 	geoHeader(const geoHeader &geo,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) :
-		PositionAttitudeTransform(geo,copyop)
+		osg::PositionAttitudeTransform(geo,copyop)
 	{ 
 	//	const geoHeaderGeo *ghg=static_cast<const geoHeaderGeo *> (&geo);
 	}

src/osgPlugins/txp/ReaderWriterTXP.cpp

@@ -234,7 +234,7 @@ class SeamFinder: public osg::NodeVisitor
 {
 public:
     SeamFinder(int x, int y, int lod, TXPArchive::TileInfo& info, TXPArchive *archive ):
-    NodeVisitor(NodeVisitor::TRAVERSE_ALL_CHILDREN),
+    osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
     _x(x), _y(y), _lod(lod), _info(info), _archive(archive) 
     {};
 

src/osgPlugins/txp/TXPArchive.cpp

@@ -295,7 +295,7 @@ bool TXPArchive::loadMaterials()
 
 bool TXPArchive::loadTexture(int i)
 {
-	if (_textures[i].get()) return true;
+    if (_textures[i].get()) return true;
 
     trpgrImageHelper image_helper(this->GetEndian(),getDir(),materialTable,texTable);
 
@@ -622,6 +622,7 @@ osg::Group* TXPArchive::getTileContent(
     osg::Group *tileGroup = _parser->parseScene(buf,_gstates,_models,realMinRange,realMaxRange,usedMaxRange);
     tileCenter = _parser->getTileCenter();
 
+#if 1
     // Prune
     unsigned int i = 0;
     for (i = 0; i < _gstates.size(); i++) 
@@ -633,7 +634,7 @@ osg::Group* TXPArchive::getTileContent(
     {
         if (_textures[i].valid() && (_textures[i]->referenceCount()==1)) _textures[i] = 0;
     }
-
+#endif
     return tileGroup;
 }
 

src/osgPlugins/txp/TXPIO.cpp

@@ -7,6 +7,8 @@
 
 #include "TXPNode.h"
 
+using namespace osg;
+
 bool TXPNode_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool TXPNode_writeLocalData(const osg::Object &obj, osgDB::Output &fw);
 

src/osgPlugins/txp/TXPNode.cpp

@@ -15,6 +15,7 @@
 
 
 using namespace txp;
+using namespace osg;
 
 
 

src/osgPlugins/txp/TXPPagedLOD.cpp

@@ -3,12 +3,12 @@
 using namespace txp;
 
 TXPPagedLOD::TXPPagedLOD():
-    PagedLOD()
+    osg::PagedLOD()
 {
 }
 
 TXPPagedLOD::TXPPagedLOD(const TXPPagedLOD& plod,const osg::CopyOp& copyop):
-    PagedLOD(plod,copyop),
+    osg::PagedLOD(plod,copyop),
     _tileIdentifier(plod._tileIdentifier)
 {
 }

src/osgPlugins/txp/TXPSeamLOD.cpp

@@ -4,6 +4,7 @@
 #include "TileMapper.h"
 
 using namespace txp;
+using namespace osg;
 
 TXPSeamLOD::TXPSeamLOD() :
     Group()

src/osgProducer/Viewer.cpp

@@ -16,6 +16,7 @@
 
 using namespace Producer;
 using namespace osgProducer;
+using namespace osg;
 
 //////////////////////////////////////////////////////////////////////////////
 //

src/osgSim/DOFTransform.cpp

@@ -13,6 +13,7 @@
 #include <osgSim/DOFTransform>
 
 using namespace osgSim;
+using namespace osg;
 
 DOFTransform::DOFTransform():
     _limitationFlags(0), 

src/osgSim/MultiSwitch.cpp

@@ -15,6 +15,7 @@
 #include <algorithm>
 
 using namespace osgSim;
+using namespace osg;
 
 MultiSwitch::MultiSwitch():
     _newChildDefaultValue(true),

src/osgSim/VisibilityGroup.cpp

@@ -17,6 +17,7 @@
 #include <osgUtil/IntersectVisitor>
 
 using namespace osgSim;
+using namespace osg;
 
 VisibilityGroup::VisibilityGroup():
     _volumeIntersectionMask(0xFFFFFFFF),