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

removed some changes I previously made

Browse source
This commit is contained in:
IsiGebauer 2025-01-12 22:25:31 +01:00
parent d5ed80c395
commit 5af348e3b8
No known key found for this signature in database
GPG key ID: 65BE6ED421A3F911
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/file_name_utils.hpp
View file

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