organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

some repairs so that the map generation works for me

Browse source
This commit is contained in:
IsiGebauer 2024-12-13 14:33:16 +01:00
parent cb76b7df86
commit b369c575e6
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
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,8 +55,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(!dir.empty(), ("JoinPath dir is empty"));
ASSERT(!fileOrDir.empty(), ("JoinPath fileOrDir is empty"));
//ASSERT(!dir.empty(), ("JoinPath dir is empty: " + dir));
ASSERT(!fileOrDir.empty(), ("JoinPath fileOrDir is empty" + fileOrDir));
return impl::JoinPath(dir, fileOrDir, std::forward<Args>(args)...);
}
} // namespace base