Changeset 9573

Show
Ignore:
Timestamp:
01/28/09 13:51:47 (4 years ago)
Author:
robert
Message:

Fixed warnings

Location:
OpenSceneGraph/trunk/src/osgPlugins
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/PrimaryRecords.cpp

    r8563 r9573  
    693693            in.forward(4); 
    694694 
    695             uint32 mask = in.readUInt32(~0); 
     695            uint32 mask = in.readUInt32(~0u); 
    696696 
    697697            // Possible bug in models with version number 15.4.1 ? 
    698698            // Symptoms: Black trees in VegaPlayer town. 
    699699            if (document.version() == 1541) 
    700                 mask = ~0; 
     700                mask = ~0u; 
    701701 
    702702            ParentPools* parentPools = new ParentPools; 

  • OpenSceneGraph/trunk/src/osgPlugins/osgSim/IO_ObjectRecordData.cpp

    r7932 r9573  
    2525); 
    2626 
     27#if 0 
     28// if deffing out as values are not used anywhere. 
    2729static const int numBits( 6 ); 
    28 typedef std::pair< std::string,unsigned int> FlagBits; 
     30typedef std::pair< std::string, osgSim::ObjectRecordData::Flags> FlagBits; 
    2931static FlagBits flagBits[numBits] = { 
    3032    FlagBits( std::string("DONT_DISPLAY_IN_DAYLIGHT"), osgSim::ObjectRecordData::DONT_DISPLAY_IN_DAYLIGHT ), 
    … …  
    3537    FlagBits( "GROUPS_SHADOW_OBJECT", osgSim::ObjectRecordData::GROUPS_SHADOW_OBJECT ) 
    3638}; 
    37  
     39#endif 
    3840bool ObjectRecordData_readLocalData(osg::Object &obj, osgDB::Input &fr) 
    3941{