gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

small fix to allow the foldername to be empty. JoinPath function then adds all the strings in args to one file-path

Browse source
This commit is contained in:
IsiGebauer 2024-12-23 18:59:19 +01:00
parent acc198b748
commit 9fbe9540db
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
base/file_name_utils.hpp
View file

@ -40,7 +40,12 @@ template <typename... Args>
std::string JoinPath(std::string const & folder, Args &&... args)
{
if (folder.empty())
return {};
{
if (sizeof...(args) == 0)
return {};
else
return impl::JoinPath(std::forward<Args>(args)...);
}
return AddSlashIfNeeded(folder) + impl::JoinPath(std::forward<Args>(args)...);
}
@ -50,7 +55,6 @@ std::string JoinPath(std::string const & folder, Args &&... args)
template <typename... Args>
std::string JoinPath(std::string const & dir, std::string const & fileOrDir, Args &&... args)
{
ASSERT(!dir.empty(), ("JoinPath dir is empty"));
ASSERT(!fileOrDir.empty(), ("JoinPath fileOrDir is empty"));
return impl::JoinPath(dir, fileOrDir, std::forward<Args>(args)...);
}