Changeset 10890 for OpenSceneGraph/trunk/src/osgWrappers/osg/GraphicsContext.cpp

Timestamp:

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

Author:

robert

Message:

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

Files:

• OpenSceneGraph/trunk/src/osgWrappers/osg/GraphicsContext.cpp (modified) (3 diffs)

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,