Made the inner helper classes friend to try and get round VS6.0 problems
This commit is contained in:
parent
8254be2962
commit
f99dc8f051
@ -457,12 +457,20 @@ class OSGDB_EXPORT Registry : public osg::Referenced
|
|||||||
struct ReadNodeFunctor;
|
struct ReadNodeFunctor;
|
||||||
struct ReadArchiveFunctor;
|
struct ReadArchiveFunctor;
|
||||||
|
|
||||||
|
// make helper classes friends to get round VS6.0 "issues"
|
||||||
|
friend struct RegReadObjectFunctor;
|
||||||
|
friend struct ReadImageFunctor;
|
||||||
|
friend struct ReadHeightFieldFunctor;
|
||||||
|
friend struct ReadNodeFunctor;
|
||||||
|
friend struct ReadArchiveFunctor;
|
||||||
|
|
||||||
ReaderWriter::ReadResult read(const ReadFunctor& readFunctor);
|
ReaderWriter::ReadResult read(const ReadFunctor& readFunctor);
|
||||||
ReaderWriter::ReadResult readImplementation(const ReadFunctor& readFunctor,bool useObjectCache);
|
ReaderWriter::ReadResult readImplementation(const ReadFunctor& readFunctor,bool useObjectCache);
|
||||||
|
|
||||||
|
|
||||||
// forward declar helper class
|
// forward declar helper class
|
||||||
class AvailableReaderWriterIterator;
|
class AvailableReaderWriterIterator;
|
||||||
|
friend class AvailableReaderWriterIterator;
|
||||||
|
|
||||||
|
|
||||||
osg::ref_ptr<ReadFileCallback> _readFileCallback;
|
osg::ref_ptr<ReadFileCallback> _readFileCallback;
|
||||||
|
Loading…
Reference in New Issue
Block a user