Show
Ignore:
Timestamp:
03/05/10 13:55:08 (5 years ago)
Author:
robert
Message:

Replaced use of unsigned int/enum mask combinations with int/enum mask combinations to avoid the need for casting enums to unsigned ints,
and to avoid associated warnings.

Update wrappers to reflect these changes.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgUtil/ShaderGen

    r9940 r11164  
    3939    }; 
    4040 
    41     typedef std::map<unsigned int, osg::ref_ptr<osg::StateSet> > StateSetMap; 
     41    typedef std::map<int, osg::ref_ptr<osg::StateSet> > StateSetMap; 
    4242 
    4343    ShaderGenCache() {}; 
    4444 
    45     void setStateSet(unsigned int stateMask, osg::StateSet *program); 
    46     osg::StateSet *getStateSet(unsigned int stateMask) const; 
    47     osg::StateSet *getOrCreateStateSet(unsigned int stateMask); 
     45    void setStateSet(int stateMask, osg::StateSet *program); 
     46    osg::StateSet *getStateSet(int stateMask) const; 
     47    osg::StateSet *getOrCreateStateSet(int stateMask); 
    4848 
    4949protected: 
    50     osg::StateSet *createStateSet(unsigned int stateMask) const; 
     50    osg::StateSet *createStateSet(int stateMask) const; 
    5151    mutable OpenThreads::Mutex _mutex; 
    5252    StateSetMap _stateSetMap;