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

Renamed osg::GraphicsContext::OperationQueue typedef to GraphicsOperationQueue to avoid naming conflict with osg::OperationQueue

Browse Source
This commit is contained in:
Robert Osfield
2009-12-14 13:42:00 +00:00
parent 8670be33c3
commit 22de011107
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osg/GraphicsContext
View File

@@ -256,10 +256,10 @@ class OSG_EXPORT GraphicsContext : public Object
/** Run the operations. */
void runOperations();
typedef std::list< ref_ptr<Operation> > OperationQueue;
typedef std::list< ref_ptr<Operation> > GraphicsOperationQueue;
/** Get the operations queue, not you must use the OperationsMutex when accessing the queue.*/
OperationQueue& getOperationsQueue() { return _operations; }
GraphicsOperationQueue& getOperationsQueue() { return _operations; }
/** Get the operations queue mutex.*/
OpenThreads::Mutex* getOperationsMutex() { return &_operationsMutex; }
@@ -471,7 +471,7 @@ class OSG_EXPORT GraphicsContext : public Object
OpenThreads::Mutex _operationsMutex;
osg::ref_ptr<osg::RefBlock> _operationsBlock;
OperationQueue _operations;
GraphicsOperationQueue _operations;
osg::ref_ptr<Operation> _currentOperation;
ref_ptr<GraphicsThread> _graphicsThread;