From 35c720420e60fa9b61d67eacb76189253095dc5a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 30 Jan 2007 14:18:39 +0000 Subject: [PATCH] From Bryan Thrall, "The osgDB::ReaderWriter and osgDB::ReaderWriter::Options classes have copy constructors that take a const osg::CopyOp rather than a osg::CopyOp&, forcing an unnecessary copy. The attached header fixes this, based off OSG 1.2. Also fixed duplicate "or" openArchive()'s comment." --- include/osgDB/ReaderWriter | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/osgDB/ReaderWriter b/include/osgDB/ReaderWriter index 7a64bb4ba..040663b7f 100644 --- a/include/osgDB/ReaderWriter +++ b/include/osgDB/ReaderWriter @@ -38,7 +38,7 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object ReaderWriter() {} - ReaderWriter(const ReaderWriter& rw,const osg::CopyOp copyop=osg::CopyOp::SHALLOW_COPY): + ReaderWriter(const ReaderWriter& rw,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): osg::Object(rw,copyop) {} virtual ~ReaderWriter(); @@ -85,7 +85,7 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object Options():_objectCacheHint(CACHE_ARCHIVES) {} Options(const std::string& str):_str(str) {} - Options(const Options& options,const osg::CopyOp copyop=osg::CopyOp::SHALLOW_COPY): + Options(const Options& options,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): osg::Object(options,copyop), _str(options._str), _databasePaths(options._databasePaths), @@ -219,7 +219,7 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object CREATE }; - /** open an archive for reading, writing or or to create an empty archive for writing to.*/ + /** open an archive for reading, writing, or to create an empty archive for writing to.*/ virtual ReadResult openArchive(const std::string& /*fileName*/,ArchiveStatus, unsigned int =4096, const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); } /** open an archive for reading.*/