From 394884ffd985930438922ad423c71b06fc5e2010 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 16 Dec 2015 00:07:20 +0100 Subject: [PATCH] Fixed: Compilation under Linux --HG-- branch : develop --- .../server/src/general_utilities_service/stat_globals.cpp | 6 +++--- code/ryzom/server/src/pd_support_service/stat_globals.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/ryzom/server/src/general_utilities_service/stat_globals.cpp b/code/ryzom/server/src/general_utilities_service/stat_globals.cpp index 40d3054ae..a501c356e 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_globals.cpp +++ b/code/ryzom/server/src/general_utilities_service/stat_globals.cpp @@ -61,19 +61,19 @@ namespace STAT_GLOBALS NLMISC::CSString getInputFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get()); - return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; + return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path); } NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get()); - return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; + return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path); } NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get()); - return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; + return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path); } diff --git a/code/ryzom/server/src/pd_support_service/stat_globals.cpp b/code/ryzom/server/src/pd_support_service/stat_globals.cpp index 78c753b53..a501c356e 100644 --- a/code/ryzom/server/src/pd_support_service/stat_globals.cpp +++ b/code/ryzom/server/src/pd_support_service/stat_globals.cpp @@ -61,19 +61,19 @@ namespace STAT_GLOBALS NLMISC::CSString getInputFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get()); - return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path; + return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path); } NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get()); - return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path; + return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path); } NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get()); - return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path; + return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path); }