From 71da5047312d63f46722e00f7ce88e0ff5e4d77f Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Wed, 15 Sep 2010 10:27:26 +0200
Subject: [PATCH] Changed: #825 Remove all warnings when compiling Ryzom

---
 code/nel/include/nel/sound/context_sound.h            | 2 +-
 code/nel/src/misc/window_displayer.cpp                | 4 ++--
 code/nel/src/sound/driver/openal/music_channel_al.cpp | 2 +-
 code/nel/tools/memory/memlog/memlog.cpp               | 4 ++--
 code/ryzom/server/src/logger_service/log_query.h      | 6 ++++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/nel/include/nel/sound/context_sound.h b/code/nel/include/nel/sound/context_sound.h
index d5d71be21..6e39bb621 100644
--- a/code/nel/include/nel/sound/context_sound.h
+++ b/code/nel/include/nel/sound/context_sound.h
@@ -174,7 +174,7 @@ class CContextSoundContainer : public IContextSoundContainer
 			return;
 		nlassertex(i==NbJoker, ("Error while adding sound '%s' into context sound container", NLMISC::CStringMapper::unmap(sound->getName()).c_str()));
 
-		int randomValue;
+		sint randomValue = 0;
 		if (UseRandom)
 		{
 			bool ok = false;
diff --git a/code/nel/src/misc/window_displayer.cpp b/code/nel/src/misc/window_displayer.cpp
index 988f8499b..f00d85dbe 100644
--- a/code/nel/src/misc/window_displayer.cpp
+++ b/code/nel/src/misc/window_displayer.cpp
@@ -80,11 +80,11 @@ bool CWindowDisplayer::update ()
 
 uint CWindowDisplayer::createLabel (const char *value)
 {
-	int pos;
+	uint pos;
 	{
 		CSynchronized<std::vector<CLabelEntry> >::CAccessor access (&_Labels);
 		access.value().push_back (CLabelEntry(value));
-		pos = (int)access.value().size()-1;
+		pos = (uint)access.value().size()-1;
 	}
 	return pos;
 }
diff --git a/code/nel/src/sound/driver/openal/music_channel_al.cpp b/code/nel/src/sound/driver/openal/music_channel_al.cpp
index d93105a92..b1849b33e 100644
--- a/code/nel/src/sound/driver/openal/music_channel_al.cpp
+++ b/code/nel/src/sound/driver/openal/music_channel_al.cpp
@@ -29,7 +29,7 @@ namespace NLSOUND
 {
 
 CMusicChannelAL::CMusicChannelAL(CSoundDriverAL *soundDriver) 
-: _MusicBuffer(NULL), _SoundDriver(soundDriver), _Gain(1.0), _Source(NULL), _Thread(NULL), _Async(false), _Playing(false), _Buffer(NULL)
+: _SoundDriver(soundDriver), _MusicBuffer(NULL), _Thread(NULL), _Buffer(NULL), _Source(NULL), _Playing(false), _Async(false), _Gain(1.0)
 {
 	// create a default source for music streaming
 	_Source = static_cast<CSourceAL*>(_SoundDriver->createSource());
diff --git a/code/nel/tools/memory/memlog/memlog.cpp b/code/nel/tools/memory/memlog/memlog.cpp
index 53a843718..a1ea89397 100644
--- a/code/nel/tools/memory/memlog/memlog.cpp
+++ b/code/nel/tools/memory/memlog/memlog.cpp
@@ -33,7 +33,7 @@ public:
 bool readString (string &str, FILE *file)
 {
 	int c;
-	while (c = fgetc (file))
+	while ((c = fgetc (file)))
 	{
 		if (c == EOF)
 			return false;
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
 	if (argc>1)
 	{
 		char buffer[512];
-		while (gets (buffer))
+		while (fgets(buffer, 512, stdin))
 		{
 			uint32 address;
 			if (strcmp (buffer, "help") == 0)
diff --git a/code/ryzom/server/src/logger_service/log_query.h b/code/ryzom/server/src/logger_service/log_query.h
index 479656c90..e4fc8ca83 100644
--- a/code/ryzom/server/src/logger_service/log_query.h
+++ b/code/ryzom/server/src/logger_service/log_query.h
@@ -788,6 +788,8 @@ struct TPredicateNode : public TQueryNode
 					ts.EndDate = ~0;
 					tl.push_back(ts);
 					break;
+				default:
+					break;
 				}
 
 				return tl;
@@ -1163,8 +1165,8 @@ public:
 		/// The iterator in the string where the error is detected
 		iterator	It;
 		/// The error string
-		char		*ErrorStr;
-		EInvalidQuery(iterator it, char *erroStr)
+		const char		*ErrorStr;
+		EInvalidQuery(iterator it, const char *erroStr)
 			:	It(it),
 				ErrorStr(erroStr)
 		{}