From 44103a7a5176a736fe3cc5b5c14b6854a9afdbcd Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 27 Jun 2010 13:05:31 +0200
Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom

---
 code/nel/src/misc/co_task.cpp                         | 2 +-
 code/nel/src/misc/vector.cpp                          | 2 +-
 code/nel/src/misc/vectord.cpp                         | 2 +-
 code/nel/src/misc/words_dictionary.cpp                | 6 ++----
 code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/code/nel/src/misc/co_task.cpp b/code/nel/src/misc/co_task.cpp
index 52b7cc2e2..89eb89c7a 100644
--- a/code/nel/src/misc/co_task.cpp
+++ b/code/nel/src/misc/co_task.cpp
@@ -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)
diff --git a/code/nel/src/misc/vector.cpp b/code/nel/src/misc/vector.cpp
index 625137243..33e7ae5d6 100644
--- a/code/nel/src/misc/vector.cpp
+++ b/code/nel/src/misc/vector.cpp
@@ -16,7 +16,7 @@
 
 #include "stdmisc.h"
 
-#include	"../../include/nel/misc/vector.h"
+#include	"nel/misc/vector.h"
 
 using namespace std;
 
diff --git a/code/nel/src/misc/vectord.cpp b/code/nel/src/misc/vectord.cpp
index bb5ca1e65..50a21a6d4 100644
--- a/code/nel/src/misc/vectord.cpp
+++ b/code/nel/src/misc/vectord.cpp
@@ -16,7 +16,7 @@
 
 #include "stdmisc.h"
 
-#include	"../../include/nel/misc/vectord.h"
+#include	"nel/misc/vectord.h"
 
 
 namespace	NLMISC
diff --git a/code/nel/src/misc/words_dictionary.cpp b/code/nel/src/misc/words_dictionary.cpp
index d2468a2f7..687f9ea79 100644
--- a/code/nel/src/misc/words_dictionary.cpp
+++ b/code/nel/src/misc/words_dictionary.cpp
@@ -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 )
diff --git a/code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp b/code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp
index 288f581ed..75f7aef18 100644
--- a/code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp
+++ b/code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp
@@ -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)
 	{