From 03ad7b63d44c50b649a0d447699fafcb89dc5949 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Dec 2016 14:51:09 +0100 Subject: [PATCH 1/2] Fixed: cpptest is using std::auto_ptr --HG-- branch : develop --- .../nel/tools/nel_unit_test/nel_unit_test.cpp | 6 ++-- code/nel/tools/nel_unit_test/ut_ligo.h | 2 +- code/nel/tools/nel_unit_test/ut_misc.h | 28 +++++++++---------- code/nel/tools/nel_unit_test/ut_net.h | 6 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/code/nel/tools/nel_unit_test/nel_unit_test.cpp b/code/nel/tools/nel_unit_test/nel_unit_test.cpp index ede52b006..d716fef98 100644 --- a/code/nel/tools/nel_unit_test/nel_unit_test.cpp +++ b/code/nel/tools/nel_unit_test/nel_unit_test.cpp @@ -134,9 +134,9 @@ int main(int argc, char *argv[]) { Test::Suite ts; - ts.add(CUniquePtr(new CUTMisc)); - ts.add(CUniquePtr(new CUTNet)); - ts.add(CUniquePtr(new CUTLigo)); + ts.add(std::auto_ptr(new CUTMisc)); + ts.add(std::auto_ptr(new CUTNet)); + ts.add(std::auto_ptr(new CUTLigo)); // Add a line here when adding a new test MODULE CUniquePtr output(cmdline(argc, argv)); diff --git a/code/nel/tools/nel_unit_test/ut_ligo.h b/code/nel/tools/nel_unit_test/ut_ligo.h index 338ffada0..c41bc1463 100644 --- a/code/nel/tools/nel_unit_test/ut_ligo.h +++ b/code/nel/tools/nel_unit_test/ut_ligo.h @@ -26,7 +26,7 @@ struct CUTLigo : public Test::Suite { CUTLigo() { - add(CUniquePtr(new CUTLigoPrimitive)); + add(std::auto_ptr(new CUTLigoPrimitive)); // Add a line here when adding a new test CLASS } }; diff --git a/code/nel/tools/nel_unit_test/ut_misc.h b/code/nel/tools/nel_unit_test/ut_misc.h index 900273260..7f125f2f3 100644 --- a/code/nel/tools/nel_unit_test/ut_misc.h +++ b/code/nel/tools/nel_unit_test/ut_misc.h @@ -37,20 +37,20 @@ struct CUTMisc : public Test::Suite { CUTMisc() { - add(CUniquePtr(new CUTMiscCoTask)); - add(CUniquePtr(new CUTMiscCommand)); - add(CUniquePtr(new CUTMiscCommon)); - add(CUniquePtr(new CUTMiscConfigFile)); - add(CUniquePtr(new CUTMiscDebug)); - add(CUniquePtr(new CUTMiscDynLibLoad)); - add(CUniquePtr(new CUTMiscFile)); - add(CUniquePtr(new CUTMiscPackFile)); - add(CUniquePtr(new CUTMiscSingleton)); - add(CUniquePtr(new CUTMiscSString)); - add(CUniquePtr(new CUTMiscStream)); - add(CUniquePtr(new CUTMiscVariable)); - add(CUniquePtr(new CUTMiscTypes)); - add(CUniquePtr(new CUTMiscStringCommon)); + add(std::auto_ptr(new CUTMiscCoTask)); + add(std::auto_ptr(new CUTMiscCommand)); + add(std::auto_ptr(new CUTMiscCommon)); + add(std::auto_ptr(new CUTMiscConfigFile)); + add(std::auto_ptr(new CUTMiscDebug)); + add(std::auto_ptr(new CUTMiscDynLibLoad)); + add(std::auto_ptr(new CUTMiscFile)); + add(std::auto_ptr(new CUTMiscPackFile)); + add(std::auto_ptr(new CUTMiscSingleton)); + add(std::auto_ptr(new CUTMiscSString)); + add(std::auto_ptr(new CUTMiscStream)); + add(std::auto_ptr(new CUTMiscVariable)); + add(std::auto_ptr(new CUTMiscTypes)); + add(std::auto_ptr(new CUTMiscStringCommon)); // Add a line here when adding a new test CLASS } }; diff --git a/code/nel/tools/nel_unit_test/ut_net.h b/code/nel/tools/nel_unit_test/ut_net.h index 64678f828..cee3b01cb 100644 --- a/code/nel/tools/nel_unit_test/ut_net.h +++ b/code/nel/tools/nel_unit_test/ut_net.h @@ -28,9 +28,9 @@ struct CUTNet : public Test::Suite { CUTNet() { - add(CUniquePtr(new CUTNetLayer3)); - add(CUniquePtr(new CUTNetMessage)); - add(CUniquePtr(new CUTNetModule)); + add(std::auto_ptr(new CUTNetLayer3)); + add(std::auto_ptr(new CUTNetMessage)); + add(std::auto_ptr(new CUTNetModule)); // Add a line here when adding a new test CLASS } }; From 43195f71a50feb5a1c15d0963f6f3465f98badfe Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Dec 2016 15:18:26 +0100 Subject: [PATCH 2/2] 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 rootNode(parseExpr(first, queryStr.end())); + std::shared_ptr 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 QueryTree; + mutable std::shared_ptr QueryTree; /// Option to extract full context with selected logs bool FullContext;