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

Changed: #825 Remove all warning when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-06-27 13:05:31 +02:00
parent 657d96fc35
commit fd08cc8e97
5 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/misc/co_task.cpp
View file

@ -28,7 +28,7 @@
#ifdef NL_GEN_DEBUG_MSG #ifdef NL_GEN_DEBUG_MSG
#define NL_CT_DEBUG nldebug #define NL_CT_DEBUG nldebug
#else #else
#define NL_CT_DEBUG if(0)nldebug #define NL_CT_DEBUG while(0)nldebug
#endif #endif
#if defined(NL_USE_THREAD_COTASK) #if defined(NL_USE_THREAD_COTASK)

2
code/nel/src/misc/vector.cpp
View file

@ -16,7 +16,7 @@
#include "stdmisc.h" #include "stdmisc.h"
#include "../../include/nel/misc/vector.h" #include "nel/misc/vector.h"
using namespace std; using namespace std;

2
code/nel/src/misc/vectord.cpp
View file

@ -16,7 +16,7 @@
#include "stdmisc.h" #include "stdmisc.h"
#include "../../include/nel/misc/vectord.h" #include "nel/misc/vectord.h"
namespace NLMISC namespace NLMISC

6
code/nel/src/misc/words_dictionary.cpp
View file

@ -205,16 +205,14 @@ void CWordsDictionary::lookup( const CSString& inputStr, CVectorSString& resultV
} }
// Search // Search
const vector<string> &vec = reinterpret_cast<const vector<string>&>(_Keys); for ( CVectorSString::const_iterator ivs=_Keys.begin(); ivs!=_Keys.end(); ++ivs )
// for ( CVectorSString::const_iterator ivs=_Keys.begin(); ivs!=_Keys.end(); ++ivs )
for ( vector<string>::const_iterator ivs=vec.begin(); ivs!=vec.end(); ++ivs )
{ {
const CSString& key = *ivs; const CSString& key = *ivs;
string::size_type p; string::size_type p;
if ( (p = key.findNS( searchStr.c_str() )) != string::npos ) if ( (p = key.findNS( searchStr.c_str() )) != string::npos )
{ {
if ( ((!findAtBeginning) || (p==0)) && ((!findAtEnd) || (p==key.size()-searchStr.size())) ) if ( ((!findAtBeginning) || (p==0)) && ((!findAtEnd) || (p==key.size()-searchStr.size())) )
resultVec.push_back( makeResult( key, _Words[ivs-vec.begin()] ) ); resultVec.push_back( makeResult( key, _Words[ivs-_Keys.begin()] ) );
} }
} }
for ( CVectorSString::const_iterator ivs=_Words.begin(); ivs!=_Words.end(); ++ivs ) for ( CVectorSString::const_iterator ivs=_Words.begin(); ivs!=_Words.end(); ++ivs )

2
code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp
View file

@ -951,7 +951,7 @@ std::string ShapesExporter::findSkeleton(const std::string &shape)
return skeleton; return skeleton;
// remove last part // remove last part
size_t pos = baseFilename.rfind("_"); std::string::size_type pos = baseFilename.rfind("_");
if (pos != std::string::npos) if (pos != std::string::npos)
{ {