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

Reorginaized the DatabaseQueue's to avoid warnings under Windows

Browse Source
This commit is contained in:
Robert Osfield
2008-05-22 12:38:36 +00:00
parent e6e4074143
commit 6a16cbfca4
2 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgDB/DatabasePager
View File

@@ -275,7 +275,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
virtual void compileAllGLObjects(osg::State& state);
/** Report how many items are in the _fileRequestList queue */
unsigned int getFileRequestListSize() const { return _fileRequestQueue._requestList.size() + _httpRequestQueue._requestList.size(); }
unsigned int getFileRequestListSize() const { return _fileRequestQueue->_requestList.size() + _httpRequestQueue->_requestList.size(); }
/** Report how many items are in the _dataToCompileList queue */
unsigned int getDataToCompileListSize() const { return _dataToCompileList.size(); }
@@ -492,8 +492,8 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
mutable OpenThreads::Mutex _numFramesActiveMutex;
int _frameNumber;
RequestQueue _fileRequestQueue;
RequestQueue _httpRequestQueue;
osg::ref_ptr<RequestQueue> _fileRequestQueue;
osg::ref_ptr<RequestQueue> _httpRequestQueue;
//DatabaseRequestList _fileRequestList;
//mutable OpenThreads::Mutex _fileRequestListMutex;