FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for SOlaris build

Browse Source
This commit is contained in:
Don BURNS
2004-11-29 03:05:27 +00:00
parent c7e8386707
commit 463b47f020
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/osgDB/DatabasePager
View File

@@ -212,19 +212,17 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
* Note, must only be called from a valid graphics context. */
virtual void compileGLObjects(osg::State& state,double& availableTime);
typedef std::list< osg::ref_ptr<osg::PagedLOD> > PagedLODList;
typedef std::set< osg::ref_ptr<osg::StateSet> > StateSetList;
typedef std::vector< osg::ref_ptr<osg::Drawable> > DrawableList;
typedef std::pair<StateSetList,DrawableList> DataToCompile;
typedef std::map< unsigned int, DataToCompile > DataToCompileMap;
typedef std::set<unsigned int> ActiveGraphicsContexts;
protected:
virtual ~DatabasePager();
typedef std::list< osg::ref_ptr<osg::PagedLOD> > PagedLODList;
typedef std::set< osg::ref_ptr<osg::StateSet> > StateSetList;
typedef std::vector< osg::ref_ptr<osg::Drawable> > DrawableList;
typedef std::pair<StateSetList,DrawableList> DataToCompile;
typedef std::map< unsigned int, DataToCompile > DataToCompileMap;
typedef std::set<unsigned int> ActiveGraphicsContexts;
friend struct DatabaseRequest;

2
include/osgDB/Registry
View File

@@ -397,6 +397,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
void eraseWrapper(DotOsgWrapperMap& wrappermap,DotOsgWrapper* wrapper);
public:
/** Functor used in internal implementations.*/
struct ReadFunctor
{
@@ -413,6 +414,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
const ReaderWriter::Options* _options;
};
protected:
// forward declare helper classes
struct ReadObjectFunctor;
struct ReadImageFunctor;