Changed: #1448 Compilation with CLang

This commit is contained in:
kervala 2012-04-07 11:29:45 +02:00
parent 9dba68559d
commit 09bb9ff7f6
3 changed files with 17 additions and 3 deletions

View file

@ -209,6 +209,8 @@ public:
{ {
#ifdef NL_DEBUG #ifdef NL_DEBUG
std::swap(_DbgData, other._DbgData); std::swap(_DbgData, other._DbgData);
#else
nlunreferenced(other);
#endif #endif
} }
@ -225,6 +227,10 @@ public:
TBMSSerialInfo serialItem( bitpos, size, type, _DbgData->NextSymbol ); TBMSSerialInfo serialItem( bitpos, size, type, _DbgData->NextSymbol );
_DbgData->List.push_back( serialItem ); _DbgData->List.push_back( serialItem );
_DbgData->NextSymbol = NULL; _DbgData->NextSymbol = NULL;
#else
nlunreferenced(bitpos);
nlunreferenced(size);
nlunreferenced(type);
#endif #endif
} }
@ -258,6 +264,10 @@ public:
nlwarning( "Missing reserve() corresponding to poke()" ); nlwarning( "Missing reserve() corresponding to poke()" );
} }
_DbgData->NextSymbol = NULL; _DbgData->NextSymbol = NULL;
#else
nlunreferenced(bitpos);
nlunreferenced(size);
nlunreferenced(type);
#endif #endif
} }
@ -266,6 +276,8 @@ public:
{ {
#ifdef NL_DEBUG #ifdef NL_DEBUG
_DbgData->NextSymbol = symbol; _DbgData->NextSymbol = symbol;
#else
nlunreferenced(symbol);
#endif #endif
} }
@ -308,6 +320,8 @@ public:
} }
//nlassert( bitpos < (*_List)[_CurrentBrowsedItem].BitPos ); // occurs if stream overflow //nlassert( bitpos < (*_List)[_CurrentBrowsedItem].BitPos ); // occurs if stream overflow
} }
#else
nlunreferenced(bitpos);
#endif #endif
*eventId = -1; *eventId = -1;
return std::string(); return std::string();

View file

@ -717,11 +717,11 @@ class CAutoMutex
TMutex &_Mutex; TMutex &_Mutex;
// forbeden copy or assignent // forbeden copy or assignent
CAutoMutex(const CAutoMutex &other) CAutoMutex(const CAutoMutex &/* other */)
{ {
} }
CAutoMutex &operator = (const CAutoMutex &other) CAutoMutex &operator = (const CAutoMutex &/* other */)
{ {
return *this; return *this;
} }

View file

@ -61,7 +61,7 @@ namespace NLMISC {
{ {
public: public:
/// Constructor. Must gives a blockMemory to ctor. NB: must gives a CBlockMemory<T, false> !!! /// Constructor. Must gives a blockMemory to ctor. NB: must gives a CBlockMemory<T, false> !!!
CSTLBlockAllocator(CBlockMemory<T, false> *bm) CSTLBlockAllocator(CBlockMemory<T, false> */* bm */)
{ {
} }
/// copy ctor /// copy ctor