diff --git a/src/osgPlugins/OpenFlight/PrimaryRecords.cpp b/src/osgPlugins/OpenFlight/PrimaryRecords.cpp index e125927e9..6de694041 100644 --- a/src/osgPlugins/OpenFlight/PrimaryRecords.cpp +++ b/src/osgPlugins/OpenFlight/PrimaryRecords.cpp @@ -692,12 +692,12 @@ protected: { in.forward(4); - uint32 mask = in.readUInt32(~0); + uint32 mask = in.readUInt32(~0u); // Possible bug in models with version number 15.4.1 ? // Symptoms: Black trees in VegaPlayer town. if (document.version() == 1541) - mask = ~0; + mask = ~0u; ParentPools* parentPools = new ParentPools; diff --git a/src/osgPlugins/osgSim/IO_ObjectRecordData.cpp b/src/osgPlugins/osgSim/IO_ObjectRecordData.cpp index 029ecaeb5..f65f03688 100644 --- a/src/osgPlugins/osgSim/IO_ObjectRecordData.cpp +++ b/src/osgPlugins/osgSim/IO_ObjectRecordData.cpp @@ -24,8 +24,10 @@ osgDB::RegisterDotOsgWrapperProxy ObjectRecordData_Proxy osgDB::DotOsgWrapper::READ_AND_WRITE ); +#if 0 +// if deffing out as values are not used anywhere. static const int numBits( 6 ); -typedef std::pair< std::string,unsigned int> FlagBits; +typedef std::pair< std::string, osgSim::ObjectRecordData::Flags> FlagBits; static FlagBits flagBits[numBits] = { FlagBits( std::string("DONT_DISPLAY_IN_DAYLIGHT"), osgSim::ObjectRecordData::DONT_DISPLAY_IN_DAYLIGHT ), FlagBits( "DONT_DISPLAY_AT_DUSK", osgSim::ObjectRecordData::DONT_DISPLAY_AT_DUSK ), @@ -34,7 +36,7 @@ static FlagBits flagBits[numBits] = { FlagBits( "FLAT_SHADED", osgSim::ObjectRecordData::FLAT_SHADED ), FlagBits( "GROUPS_SHADOW_OBJECT", osgSim::ObjectRecordData::GROUPS_SHADOW_OBJECT ) }; - +#endif bool ObjectRecordData_readLocalData(osg::Object &obj, osgDB::Input &fr) { bool iteratorAdvanced = false;