Changeset 10890

Timestamp:

12/14/09 14:42:00 (4 years ago)

Author:

robert

Message:

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

Location:

OpenSceneGraph/trunk

Files:

• include/osg/GraphicsContext (modified) (2 diffs)
• src/osg/GraphicsContext.cpp (modified) (3 diffs)
• src/osgWrappers/osg/GraphicsContext.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/include/osg/GraphicsContext

@@ -257 +257 @@
         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.*/
@@ -472 +472 @@
         OpenThreads::Mutex                  _operationsMutex;
         osg::ref_ptr<osg::RefBlock>         _operationsBlock;
-        OperationQueue                      _operations;
+        GraphicsOperationQueue              _operations;
         osg::ref_ptr<Operation>             _currentOperation;
 

OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp

@@ -680 +680 @@
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
 
-    for(OperationQueue::iterator itr = _operations.begin();
+    for(GraphicsOperationQueue::iterator itr = _operations.begin();
         itr!=_operations.end();)
     {
@@ -701 +701 @@
 
     // find the remove all operations with specified name
-    for(OperationQueue::iterator itr = _operations.begin();
+    for(GraphicsOperationQueue::iterator itr = _operations.begin();
         itr!=_operations.end();)
     {
@@ -751 +751 @@
     }
 
-    for(OperationQueue::iterator itr = _operations.begin();
+    for(GraphicsOperationQueue::iterator itr = _operations.begin();
         itr != _operations.end();
         )

OpenSceneGraph/trunk/src/osgWrappers/osg/GraphicsContext.cpp

@@ -34 +34 @@
 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)
@@ -114 +114 @@
                   "Run the operations. ",
                   "");
-        I_Method0(osg::GraphicsContext::OperationQueue &, getOperationsQueue,
-                  Properties::NON_VIRTUAL,
-                  __OperationQueue_R1__getOperationsQueue,
+        I_Method0(osg::GraphicsContext::GraphicsOperationQueue &, getOperationsQueue,
+                  Properties::NON_VIRTUAL,
+                  __GraphicsOperationQueue_R1__getOperationsQueue,
                   "Get the operations queue, not you must use the OperationsMutex when accessing the queue. ",
                   "");
@@ -396 +396 @@
                          __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,