mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-29 20:30:54 +00:00
Changed: #825 Remove all warning when compiling Ryzom
This commit is contained in:
parent
df304689fc
commit
7cb5099a1c
5 changed files with 6 additions and 8 deletions
|
@ -28,7 +28,7 @@
|
|||
#ifdef NL_GEN_DEBUG_MSG
|
||||
#define NL_CT_DEBUG nldebug
|
||||
#else
|
||||
#define NL_CT_DEBUG if(0)nldebug
|
||||
#define NL_CT_DEBUG while(0)nldebug
|
||||
#endif
|
||||
|
||||
#if defined(NL_USE_THREAD_COTASK)
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "stdmisc.h"
|
||||
|
||||
#include "../../include/nel/misc/vector.h"
|
||||
#include "nel/misc/vector.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "stdmisc.h"
|
||||
|
||||
#include "../../include/nel/misc/vectord.h"
|
||||
#include "nel/misc/vectord.h"
|
||||
|
||||
|
||||
namespace NLMISC
|
||||
|
|
|
@ -205,16 +205,14 @@ void CWordsDictionary::lookup( const CSString& inputStr, CVectorSString& resultV
|
|||
}
|
||||
|
||||
// Search
|
||||
const vector<string> &vec = reinterpret_cast<const vector<string>&>(_Keys);
|
||||
// for ( CVectorSString::const_iterator ivs=_Keys.begin(); ivs!=_Keys.end(); ++ivs )
|
||||
for ( vector<string>::const_iterator ivs=vec.begin(); ivs!=vec.end(); ++ivs )
|
||||
for ( CVectorSString::const_iterator ivs=_Keys.begin(); ivs!=_Keys.end(); ++ivs )
|
||||
{
|
||||
const CSString& key = *ivs;
|
||||
string::size_type p;
|
||||
if ( (p = key.findNS( searchStr.c_str() )) != string::npos )
|
||||
{
|
||||
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 )
|
||||
|
|
|
@ -951,7 +951,7 @@ std::string ShapesExporter::findSkeleton(const std::string &shape)
|
|||
return skeleton;
|
||||
|
||||
// remove last part
|
||||
size_t pos = baseFilename.rfind("_");
|
||||
std::string::size_type pos = baseFilename.rfind("_");
|
||||
|
||||
if (pos != std::string::npos)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue