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
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();
)
{