From 6630cfb455d440c6c8386cb829a993a573ff036b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sun, 3 Feb 2002 19:18:14 +0000 Subject: [PATCH] Fixes for GCC 3.0.3 build. --- include/osgUtil/RenderLeaf | 2 +- include/osgUtil/Tesselator | 2 +- src/osgPlugins/flt/Record.h | 8 ++++---- src/osgUtil/NvTriStripObjects.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/osgUtil/RenderLeaf b/include/osgUtil/RenderLeaf index 5b8c88e2a..abd5a7900 100644 --- a/include/osgUtil/RenderLeaf +++ b/include/osgUtil/RenderLeaf @@ -51,7 +51,7 @@ class OSGUTIL_EXPORT RenderLeaf : public osg::Referenced virtual void render(osg::State& state,RenderLeaf* previous); /// allow RenderGraph to change the RenderLeaf's _parent. - friend RenderGraph; + friend class osgUtil::RenderGraph; public: diff --git a/include/osgUtil/Tesselator b/include/osgUtil/Tesselator index deca804a7..200866543 100644 --- a/include/osgUtil/Tesselator +++ b/include/osgUtil/Tesselator @@ -98,7 +98,7 @@ class OSGUTIL_EXPORT Tesselator protected: - friend VertexIndexSet; + friend struct VertexIndexSet; typedef std::vector CoordVec; diff --git a/src/osgPlugins/flt/Record.h b/src/osgPlugins/flt/Record.h index 3a4f43913..416c936b7 100644 --- a/src/osgPlugins/flt/Record.h +++ b/src/osgPlugins/flt/Record.h @@ -80,9 +80,9 @@ class Record : public osg::Referenced Record* _pParent; FltFile* _pFltFile; - friend Input; - friend FltFile; - friend PrimNodeRecord; + friend class Input; + friend class FltFile; + friend class PrimNodeRecord; private: @@ -176,7 +176,7 @@ class PrimNodeRecord : public Record typedef std::vector > ChildList; ChildList _children; - friend FaceRecord; + friend class FaceRecord; }; diff --git a/src/osgUtil/NvTriStripObjects.h b/src/osgUtil/NvTriStripObjects.h index 8f4fb842f..7931654dc 100644 --- a/src/osgUtil/NvTriStripObjects.h +++ b/src/osgUtil/NvTriStripObjects.h @@ -291,6 +291,6 @@ class NvStripifier // let our strip info classes and the other classes get // to these protected stripificaton methods if they want - friend NvStripInfo; + friend class NvStripInfo; }; #endif