Fixed: Compilation under Linux

--HG--
branch : develop
This commit is contained in:
kervala 2015-12-16 00:07:20 +01:00
parent ec8d9ea266
commit 394884ffd9
2 changed files with 6 additions and 6 deletions

View file

@ -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);
}

View file

@ -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);
}