FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for IRIX build

Browse Source
This commit is contained in:
Don BURNS
2004-11-29 01:12:25 +00:00
parent 860bc59f8e
commit c7e8386707
10 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgDB/ImageOptions
View File

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

5
include/osgDB/ReaderWriter
View File

@@ -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) {}

2
include/osgDB/ReentrantMutex
View File

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