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;

6
src/osg/GraphicsContext.cpp
View File

@@ -679,7 +679,7 @@ void GraphicsContext::remove(Operation* operation)
// acquire the lock on the operations queue to prevent anyone else for modifying it at the same time
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
for(OperationQueue::iterator itr = _operations.begin();
for(GraphicsOperationQueue::iterator itr = _operations.begin();
itr!=_operations.end();)
{
if ((*itr)==operation) itr = _operations.erase(itr);
@@ -700,7 +700,7 @@ void GraphicsContext::remove(const std::string& name)
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
// find the remove all operations with specified name
for(OperationQueue::iterator itr = _operations.begin();
for(GraphicsOperationQueue::iterator itr = _operations.begin();
itr!=_operations.end();)
{
if ((*itr)->getName()==name) itr = _operations.erase(itr);
@@ -750,7 +750,7 @@ void GraphicsContext::runOperations()
if (camera->getRenderer()) (*(camera->getRenderer()))(this);
}
for(OperationQueue::iterator itr = _operations.begin();
for(GraphicsOperationQueue::iterator itr = _operations.begin();
itr != _operations.end();
)
{

10
src/osgWrappers/osg/GraphicsContext.cpp
View File

@@ -33,7 +33,7 @@ TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext::ScreenSettings >, osg::Graphi
TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osg::GraphicsContext::GraphicsContexts)
TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Operation > >, osg::GraphicsContext::OperationQueue)
TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Operation > >, osg::GraphicsContext::GraphicsOperationQueue)
TYPE_NAME_ALIAS(std::list< osg::Camera * >, osg::GraphicsContext::Cameras)
@@ -113,9 +113,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext)
__void__runOperations,
"Run the operations. ",
"");
I_Method0(osg::GraphicsContext::OperationQueue &, getOperationsQueue,
I_Method0(osg::GraphicsContext::GraphicsOperationQueue &, getOperationsQueue,
Properties::NON_VIRTUAL,
__OperationQueue_R1__getOperationsQueue,
__GraphicsOperationQueue_R1__getOperationsQueue,
"Get the operations queue, not you must use the OperationsMutex when accessing the queue. ",
"");
I_Method0(OpenThreads::Mutex *, getOperationsMutex,
@@ -395,8 +395,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext)
I_SimpleProperty(OpenThreads::Mutex *, OperationsMutex,
__OpenThreads_Mutex_P1__getOperationsMutex,
0);
I_SimpleProperty(osg::GraphicsContext::OperationQueue &, OperationsQueue,
__OperationQueue_R1__getOperationsQueue,
I_SimpleProperty(osg::GraphicsContext::GraphicsOperationQueue &, OperationsQueue,
__GraphicsOperationQueue_R1__getOperationsQueue,
0);
I_SimpleProperty(osg::GraphicsContext::ResizedCallback *, ResizedCallback,
__ResizedCallback_P1__getResizedCallback,