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

Preventing checks in case of DebugPrint of invalid GeoObjectIds.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-09-07 15:43:29 +03:00 • committed by Maksim Andrianov
parent 97856a84c4
commit 2269433a5e
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
base/geo_object_id.cpp
View file

@ -89,7 +89,10 @@ std::string DebugPrint(GeoObjectId::Type const & t)
std::string DebugPrint(GeoObjectId const & id)
{
std::ostringstream oss;
oss << DebugPrint(id.GetType()) << " " << id.GetSerialId();
// To print serial id it's written |id.m_encodedId & kSerialMask| instead of id.GetSerialId().
// It's done to be able to print a instance of GeoObjectId created by default constructor.
// In case of instance of GeoObjectId created by default ctor GetSerialId() shouldn't be called.
oss << DebugPrint(id.GetType()) << " " << (id.m_encodedId & kSerialMask);
return oss.str();
}
} // namespace base

2
base/geo_object_id.hpp
View file

@ -35,6 +35,8 @@ namespace base
// and the difference does not seem important. Also this would probably touch the highest bit.
class GeoObjectId
{
friend std::string DebugPrint(GeoObjectId const & id);
public:
// Sources of the objects.
enum class Type : uint8_t