From 48dd7cd486f44f29c10cc6e44ecb8578f18f439a Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 11 Jun 2010 13:20:13 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom on Linux --- code/nel/src/misc/displayer.cpp | 2 +- code/ryzom/common/src/game_share/server_edition_module.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/nel/src/misc/displayer.cpp b/code/nel/src/misc/displayer.cpp index 93cb5be2c..4f4e0866a 100644 --- a/code/nel/src/misc/displayer.cpp +++ b/code/nel/src/misc/displayer.cpp @@ -230,7 +230,7 @@ void CStdDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mess printf ("%s", str.c_str()); if (!args.CallstackAndLog.empty()) - printf (args.CallstackAndLog.c_str()); + printf ("%s", args.CallstackAndLog.c_str()); fflush(stdout); } diff --git a/code/ryzom/common/src/game_share/server_edition_module.cpp b/code/ryzom/common/src/game_share/server_edition_module.cpp index a7a6f4ed9..3e178e12f 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.cpp +++ b/code/ryzom/common/src/game_share/server_edition_module.cpp @@ -2572,7 +2572,7 @@ TUserRole CServerEditionModule::getRoleByCharId(TCharId charId) const } -TPioneersSessionsAllowed * const CServerEditionModule::getSessionAllowedForChar(TCharId charId) const +TPioneersSessionsAllowed * CServerEditionModule::getSessionAllowedForChar(TCharId charId) const { TPioneersSessionsAlloweds::const_iterator found = _PioneersSessionsAllowed.find(charId); if (found == _PioneersSessionsAllowed.end()) return NULL;