Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #825 Remove all warnings when compiling Ryzom

Browse source
This commit is contained in:
kervala 2012-04-07 15:56:41 +02:00
parent 47bf2e82a4
commit 22b77a597f
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/nel/include/nel/misc/bit_mem_stream.h
View file

@ -801,11 +801,7 @@ void displayBitStream( const CBitMemStream& msg, sint beginbitpos, sint endbitpo
inline std::string CBMSDbgInfo::getEventLegendAtBitPos( CBitMemStream& bms, sint32 eventId ) inline std::string CBMSDbgInfo::getEventLegendAtBitPos( CBitMemStream& bms, sint32 eventId )
{ {
#ifdef NL_DEBUG #ifdef NL_DEBUG
if ( eventId == -1 ) if ( eventId != -1 )
{
return std::string();
}
else
{ {
nlassert( eventId < (sint32)_DbgData->List.size() ); nlassert( eventId < (sint32)_DbgData->List.size() );
TBMSSerialInfo& serialItem = _DbgData->List[eventId]; // works only with a vector! TBMSSerialInfo& serialItem = _DbgData->List[eventId]; // works only with a vector!
@ -814,8 +810,11 @@ inline std::string CBMSDbgInfo::getEventLegendAtBitPos( CBitMemStream& bms, sint
bms.getSerialItem( serialItem ).c_str(), (serialItem.Symbol!=NULL)?serialItem.Symbol:"" ); bms.getSerialItem( serialItem ).c_str(), (serialItem.Symbol!=NULL)?serialItem.Symbol:"" );
} }
#else #else
return std::string(); nlunreferenced(bms);
nlunreferenced(eventId);
#endif #endif
return std::string();
} }

2
code/nel/include/nel/misc/static_map.h
View file

@ -93,7 +93,7 @@ public:
{ {
} }
explicit CStaticMap (const Comp& __comp) : _DataSorted(true) explicit CStaticMap (const Comp& /* __comp */) : _DataSorted(true)
{ {
} }