Show
Ignore:
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?

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgWrappers/osg/GraphicsContext.cpp

    r10767 r10890  
    3434TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osg::GraphicsContext::GraphicsContexts) 
    3535 
    36 TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Operation > >, osg::GraphicsContext::OperationQueue) 
     36TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Operation > >, osg::GraphicsContext::GraphicsOperationQueue) 
    3737 
    3838TYPE_NAME_ALIAS(std::list< osg::Camera * >, osg::GraphicsContext::Cameras) 
     
    114114                  "Run the operations. ", 
    115115                  ""); 
    116         I_Method0(osg::GraphicsContext::OperationQueue &, getOperationsQueue, 
    117                   Properties::NON_VIRTUAL, 
    118                   __OperationQueue_R1__getOperationsQueue, 
     116        I_Method0(osg::GraphicsContext::GraphicsOperationQueue &, getOperationsQueue, 
     117                  Properties::NON_VIRTUAL, 
     118                  __GraphicsOperationQueue_R1__getOperationsQueue, 
    119119                  "Get the operations queue, not you must use the OperationsMutex when accessing the queue. ", 
    120120                  ""); 
     
    396396                         __OpenThreads_Mutex_P1__getOperationsMutex,  
    397397                         0); 
    398         I_SimpleProperty(osg::GraphicsContext::OperationQueue &, OperationsQueue,  
    399                          __OperationQueue_R1__getOperationsQueue,  
     398        I_SimpleProperty(osg::GraphicsContext::GraphicsOperationQueue &, OperationsQueue,  
     399                         __GraphicsOperationQueue_R1__getOperationsQueue,  
    400400                         0); 
    401401        I_SimpleProperty(osg::GraphicsContext::ResizedCallback *, ResizedCallback,