From 50276329253fc560c2ec46dcd3e1717984f36b38 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 7 Apr 2012 15:56:41 +0200 Subject: [PATCH] Changed: #825 Remove all warnings when compiling Ryzom --- code/nel/include/nel/misc/bit_mem_stream.h | 11 +++++------ code/nel/include/nel/misc/static_map.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/nel/include/nel/misc/bit_mem_stream.h b/code/nel/include/nel/misc/bit_mem_stream.h index f9572084d..3bddc20f7 100644 --- a/code/nel/include/nel/misc/bit_mem_stream.h +++ b/code/nel/include/nel/misc/bit_mem_stream.h @@ -801,11 +801,7 @@ void displayBitStream( const CBitMemStream& msg, sint beginbitpos, sint endbitpo inline std::string CBMSDbgInfo::getEventLegendAtBitPos( CBitMemStream& bms, sint32 eventId ) { #ifdef NL_DEBUG - if ( eventId == -1 ) - { - return std::string(); - } - else + if ( eventId != -1 ) { nlassert( eventId < (sint32)_DbgData->List.size() ); 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:"" ); } #else - return std::string(); + nlunreferenced(bms); + nlunreferenced(eventId); #endif + + return std::string(); } diff --git a/code/nel/include/nel/misc/static_map.h b/code/nel/include/nel/misc/static_map.h index 0fd1f8857..b5ec3e228 100644 --- a/code/nel/include/nel/misc/static_map.h +++ b/code/nel/include/nel/misc/static_map.h @@ -93,7 +93,7 @@ public: { } - explicit CStaticMap (const Comp& __comp) : _DataSorted(true) + explicit CStaticMap (const Comp& /* __comp */) : _DataSorted(true) { }