Made the inner helper classes friend to try and get round VS6.0 problems

This commit is contained in:
Robert Osfield 2004-11-16 14:10:30 +00:00
parent 8254be2962
commit f99dc8f051

View File

@ -456,6 +456,13 @@ class OSGDB_EXPORT Registry : public osg::Referenced
struct ReadHeightFieldFunctor; struct ReadHeightFieldFunctor;
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);
@ -463,6 +470,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
// 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;