From f99dc8f051db9bc61446352c35fd7c82dcb97b2f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 16 Nov 2004 14:10:30 +0000 Subject: [PATCH] Made the inner helper classes friend to try and get round VS6.0 problems --- include/osgDB/Registry | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/osgDB/Registry b/include/osgDB/Registry index 76836dbc3..91b989941 100644 --- a/include/osgDB/Registry +++ b/include/osgDB/Registry @@ -456,6 +456,13 @@ class OSGDB_EXPORT Registry : public osg::Referenced struct ReadHeightFieldFunctor; struct ReadNodeFunctor; 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 readImplementation(const ReadFunctor& readFunctor,bool useObjectCache); @@ -463,6 +470,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced // forward declar helper class class AvailableReaderWriterIterator; + friend class AvailableReaderWriterIterator; osg::ref_ptr _readFileCallback;