From 43195f71a50feb5a1c15d0963f6f3465f98badfe Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Wed, 21 Dec 2016 15:18:26 +0100
Subject: [PATCH] Fixed: Servers compilation under Linux

--HG--
branch : develop
---
 .../src/entities_game_service/harvest_source.cpp       |  2 +-
 .../mission_manager/mission_log.h                      | 10 +++++-----
 .../player_manager/admin_properties.cpp                |  3 ++-
 code/ryzom/server/src/logger_service/log_query.cpp     |  2 +-
 code/ryzom/server/src/logger_service/log_query.h       |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/ryzom/server/src/entities_game_service/harvest_source.cpp b/code/ryzom/server/src/entities_game_service/harvest_source.cpp
index 3da4285b5..e78d3bea0 100644
--- a/code/ryzom/server/src/entities_game_service/harvest_source.cpp
+++ b/code/ryzom/server/src/entities_game_service/harvest_source.cpp
@@ -84,7 +84,7 @@ uint ImpactSchemes [6][3] = { { 0, 1, 2 }, { 0, 2, 1 }, { 1, 0, 2 }, { 1, 2, 0 }
 // Observed impact on E (/10):     6            3            1            1            3           10
 // Note: if modifying this schemes, please change FORAGE_SOURCE_IMPACT_MODE in phrase_en.txt.
 uint SpecialNewbieImpactSchemeD = 10;
-uint16 LowDangerMappings [2] = { SpecialNewbieImpactSchemeD+1, SpecialNewbieImpactSchemeD+4 };
+uint16 LowDangerMappings [2] = { (uint16)SpecialNewbieImpactSchemeD+1, (uint16)SpecialNewbieImpactSchemeD+4 };
 
 sint8 ExplosionResetPeriod = 50; // 5 s
 
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_log.h b/code/ryzom/server/src/entities_game_service/mission_manager/mission_log.h
index 79dfa188a..296c18dc8 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_log.h
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_log.h
@@ -61,11 +61,11 @@ extern CMissionLog	MissionLog;
 #define MISDBG if ( !VerboseMissions ){} else MISLOG
 
 // Syntax error logged to egs_mission.log
-#define MISLOGSYNTAXERROR(_PHRASE_)				MISLOG("sline:%u SYNTAX ERROR %s : "_PHRASE_, line, script[0].c_str());
-#define MISLOGSYNTAXERROR1(_PHRASE_,_PARAM_)	MISLOG("sline:%u SYNTAX ERROR %s : "_PHRASE_, line, script[0].c_str(), _PARAM_);
-#define MISLOGERROR(_PHRASE_)						MISLOG("sline:%u ERROR %s : "_PHRASE_, line, script[0].c_str());
-#define MISLOGERROR1(_PHRASE_,_PARAM_)				MISLOG("sline:%u ERROR %s : "_PHRASE_, line, script[0].c_str(), _PARAM_);
-#define MISLOGERROR2(_PHRASE_,_PARAM1_,_PARAM2_)	MISLOG("sline:%u ERROR %s : "_PHRASE_, line, script[0].c_str(), _PARAM1_, _PARAM2_);
+#define MISLOGSYNTAXERROR(_PHRASE_)				MISLOG("sline:%u SYNTAX ERROR %s : " _PHRASE_, line, script[0].c_str());
+#define MISLOGSYNTAXERROR1(_PHRASE_, _PARAM_)	MISLOG("sline:%u SYNTAX ERROR %s : " _PHRASE_, line, script[0].c_str(), _PARAM_);
+#define MISLOGERROR(_PHRASE_)						MISLOG("sline:%u ERROR %s : " _PHRASE_, line, script[0].c_str());
+#define MISLOGERROR1(_PHRASE_, _PARAM_)				MISLOG("sline:%u ERROR %s : " _PHRASE_, line, script[0].c_str(), _PARAM_);
+#define MISLOGERROR2(_PHRASE_, _PARAM1_, _PARAM2_)	MISLOG("sline:%u ERROR %s : " _PHRASE_, line, script[0].c_str(), _PARAM1_, _PARAM2_);
 
 
 
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/admin_properties.cpp b/code/ryzom/server/src/entities_game_service/player_manager/admin_properties.cpp
index b455ec368..c56e96c16 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/admin_properties.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/admin_properties.cpp
@@ -80,6 +80,7 @@ void CAdminProperties::updateCSRJournal( CCharacter * user, CMission * mission,u
 
 CMission* CAdminProperties::getMission(uint indexInJournal) const
 {
+/*
 	if (!_Data) return NULL;
 
 	CCharacter *user = PlayerManager.getChar(_Data->MissionUser);
@@ -90,7 +91,7 @@ CMission* CAdminProperties::getMission(uint indexInJournal) const
 	if (indexInJournal < user->getMissions().size())
 		return (CMission*)user->getMissions()[indexInJournal];
 
-/*
+
 	indexInJournal -= MaxSoloMissionCount;
 	CTeam * team = TeamManager.getTeam( user->getTeamId() );
 	if (team)
diff --git a/code/ryzom/server/src/logger_service/log_query.cpp b/code/ryzom/server/src/logger_service/log_query.cpp
index 9a53856a6..069409313 100644
--- a/code/ryzom/server/src/logger_service/log_query.cpp
+++ b/code/ryzom/server/src/logger_service/log_query.cpp
@@ -145,7 +145,7 @@ CQueryParser::TParserResult CQueryParser::parseQuery(const std::string &queryStr
 			return pr;
 		}
 
-		CUniquePtr<TQueryNode> rootNode(parseExpr(first, queryStr.end()));
+		std::shared_ptr<TQueryNode> rootNode(parseExpr(first, queryStr.end()));
 
 		// make sure we have consumed all the stream
 		iterator rew = first;
diff --git a/code/ryzom/server/src/logger_service/log_query.h b/code/ryzom/server/src/logger_service/log_query.h
index ba10d7602..5c2d6d460 100644
--- a/code/ryzom/server/src/logger_service/log_query.h
+++ b/code/ryzom/server/src/logger_service/log_query.h
@@ -1190,7 +1190,7 @@ public:
 	struct TParserResult
 	{
 		/// The query tree
-		mutable CUniquePtr<TQueryNode> QueryTree;
+		mutable std::shared_ptr<TQueryNode> QueryTree;
 
 		/// Option to extract full context with selected logs
 		bool		FullContext;