Show
Ignore:
Timestamp:
03/05/10 13:55:08 (4 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/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp

    r10967 r11164  
    3333END_REFLECTOR 
    3434 
    35 TYPE_NAME_ALIAS(std::map< unsigned int COMMA  osg::ref_ptr< osg::StateSet > >, osgUtil::ShaderGenCache::StateSetMap) 
     35TYPE_NAME_ALIAS(std::map< int COMMA  osg::ref_ptr< osg::StateSet > >, osgUtil::ShaderGenCache::StateSetMap) 
    3636 
    3737BEGIN_OBJECT_REFLECTOR(osgUtil::ShaderGenCache) 
     
    4141                       "", 
    4242                       ""); 
    43         I_Method2(void, setStateSet, IN, unsigned int, stateMask, IN, osg::StateSet *, program, 
     43        I_Method2(void, setStateSet, IN, int, stateMask, IN, osg::StateSet *, program, 
    4444                  Properties::NON_VIRTUAL, 
    45                   __void__setStateSet__unsigned_int__osg_StateSet_P1, 
     45                  __void__setStateSet__int__osg_StateSet_P1, 
    4646                  "", 
    4747                  ""); 
    48         I_Method1(osg::StateSet *, getStateSet, IN, unsigned int, stateMask, 
     48        I_Method1(osg::StateSet *, getStateSet, IN, int, stateMask, 
    4949                  Properties::NON_VIRTUAL, 
    50                   __osg_StateSet_P1__getStateSet__unsigned_int, 
     50                  __osg_StateSet_P1__getStateSet__int, 
    5151                  "", 
    5252                  ""); 
    53         I_Method1(osg::StateSet *, getOrCreateStateSet, IN, unsigned int, stateMask, 
     53        I_Method1(osg::StateSet *, getOrCreateStateSet, IN, int, stateMask, 
    5454                  Properties::NON_VIRTUAL, 
    55                   __osg_StateSet_P1__getOrCreateStateSet__unsigned_int, 
     55                  __osg_StateSet_P1__getOrCreateStateSet__int, 
    5656                  "", 
    5757                  ""); 
    58         I_ProtectedMethod1(osg::StateSet *, createStateSet, IN, unsigned int, stateMask, 
     58        I_ProtectedMethod1(osg::StateSet *, createStateSet, IN, int, stateMask, 
    5959                           Properties::NON_VIRTUAL, 
    6060                           Properties::CONST, 
    61                            __osg_StateSet_P1__createStateSet__unsigned_int, 
     61                           __osg_StateSet_P1__createStateSet__int, 
    6262                           "", 
    6363                           ""); 
    6464        I_IndexedProperty(osg::StateSet *, StateSet,  
    65                           __osg_StateSet_P1__getStateSet__unsigned_int,  
    66                           __void__setStateSet__unsigned_int__osg_StateSet_P1,  
     65                          __osg_StateSet_P1__getStateSet__int,  
     66                          __void__setStateSet__int__osg_StateSet_P1,  
    6767                          0); 
    6868END_REFLECTOR 
     
    128128END_REFLECTOR 
    129129 
    130 STD_MAP_REFLECTOR(std::map< unsigned int COMMA  osg::ref_ptr< osg::StateSet > >) 
     130STD_MAP_REFLECTOR(std::map< int COMMA  osg::ref_ptr< osg::StateSet > >) 
    131131