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

Factor out DebugPrint for MwmSet::MwmId.

Browse source
This commit is contained in:
vng 2015-07-15 15:39:53 +03:00 • committed by Alex Zolotarev
parent 29aa3a7d7d
commit 05c79ca2a6
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
indexer/feature_decl.cpp
View file

@ -6,6 +6,6 @@
string DebugPrint(FeatureID const & id)
{
ostringstream ss;
ss << "{ " << id.m_mwmId << ", " << id.m_ind << " }";
ss << "{ " << DebugPrint(id.m_mwmId) << ", " << id.m_ind << " }";
return ss.str();
}

12
indexer/mwm_set.cpp
View file

@ -8,6 +8,8 @@
#include "base/stl_add.hpp"
#include "std/algorithm.hpp"
#include "std/sstream.hpp"
using platform::CountryFile;
using platform::LocalCountryFile;
@ -24,6 +26,16 @@ MwmInfo::MwmTypeT MwmInfo::GetType() const
return COASTS;
}
string DebugPrint(MwmSet::MwmId const & id)
{
ostringstream ss;
if (id.m_info.get())
ss << "MwmId [" << id.m_info->GetCountryName() << "]";
else
ss << "MwmId [invalid]";
return ss.str();
}
MwmSet::MwmHandle::MwmHandle() : m_mwmSet(nullptr), m_mwmId(), m_value(nullptr) {}
MwmSet::MwmHandle::MwmHandle(MwmSet & mwmSet, MwmId const & mwmId)

11
indexer/mwm_set.hpp
View file

@ -10,7 +10,6 @@
#include "base/macros.hpp"
#include "std/deque.hpp"
#include "std/iostream.hpp"
#include "std/map.hpp"
#include "std/mutex.hpp"
#include "std/shared_ptr.hpp"
@ -18,6 +17,7 @@
#include "std/utility.hpp"
#include "std/vector.hpp"
/// Information about stored mwm.
class MwmInfo
{
@ -97,14 +97,7 @@ public:
inline bool operator!=(MwmId const & rhs) const { return !(*this == rhs); }
inline bool operator<(MwmId const & rhs) const { return GetInfo() < rhs.GetInfo(); }
friend ostream & operator<<(ostream & os, MwmId const & id)
{
if (id.m_info.get())
os << "MwmId [" << id.m_info->GetCountryName() << "]";
else
os << "MwmId [invalid]";
return os;
}
friend string DebugPrint(MwmId const & id);
private:
shared_ptr<MwmInfo> m_info;