drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-02 19:13:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unity build error by removing using namespace std;

Browse Source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk
2025-07-26 21:46:13 +02:00
committed by Konstantin Pastbin
parent b5b333c832
commit 215c19dcc7
17 changed files with 184 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/platform/local_country_file.cpp
View File

@@ -16,11 +16,10 @@
namespace platform
{
using namespace std;
LocalCountryFile::LocalCountryFile() : m_version(0) {}
LocalCountryFile::LocalCountryFile(string directory, CountryFile countryFile, int64_t version)
LocalCountryFile::LocalCountryFile(std::string directory, CountryFile countryFile, int64_t version)
: m_directory(std::move(directory))
, m_countryFile(std::move(countryFile))
, m_version(version)
@@ -58,7 +57,7 @@ void LocalCountryFile::DeleteFromDisk(MapFileType type) const
LOG(LERROR, (type, "from", *this, "wasn't deleted from disk."));
}
string LocalCountryFile::GetPath(MapFileType type) const
std::string LocalCountryFile::GetPath(MapFileType type) const
{
return base::JoinPath(m_directory, GetFileName(type));
}
@@ -114,7 +113,7 @@ bool LocalCountryFile::ValidateIntegrity() const
}
// static
LocalCountryFile LocalCountryFile::MakeForTesting(string countryFileName, int64_t version)
LocalCountryFile LocalCountryFile::MakeForTesting(std::string countryFileName, int64_t version)
{
LocalCountryFile localFile(GetPlatform().WritableDir(), CountryFile(std::move(countryFileName)), version);
localFile.SyncWithDisk();
@@ -122,18 +121,18 @@ LocalCountryFile LocalCountryFile::MakeForTesting(string countryFileName, int64_
}
// static
LocalCountryFile LocalCountryFile::MakeTemporary(string const & fullPath)
LocalCountryFile LocalCountryFile::MakeTemporary(std::string const & fullPath)
{
string name = fullPath;
auto name = fullPath;
base::GetNameFromFullPath(name);
base::GetNameWithoutExt(name);
return LocalCountryFile(base::GetDirectory(fullPath), CountryFile(std::move(name)), 0 /* version */);
}
string DebugPrint(LocalCountryFile const & file)
std::string DebugPrint(LocalCountryFile const & file)
{
ostringstream os;
std::ostringstream os;
os << "LocalCountryFile [" << file.m_directory << ", " << DebugPrint(file.m_countryFile) << ", " << file.m_version
<< ", [";