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

This commit is contained in:
Robert Osfield
2004-01-29 15:47:51 +00:00
parent 965ed49427
commit dea75f5510
17 changed files with 24 additions and 10 deletions

View File

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

View File

@@ -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;
}

View File

@@ -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

View File

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