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

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-08-24 07:30:06 +03:00 • committed by Tatiana Yan
parent e19041a3ad
commit f8c7d2fac9
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
base/geo_object_id.cpp
View file

@ -1,7 +1,6 @@
#include "base/geo_object_id.hpp"
#include "base/assert.hpp"
#include "base/macros.hpp"
#include <sstream>
@ -27,8 +26,8 @@ GeoObjectId::GeoObjectId(GeoObjectId::Type type, uint64_t id)
uint64_t GeoObjectId::GetSerialId() const
{
ASSERT_NOT_EQUAL(m_encodedId & kTypeMask, 0, ());
ASSERT_EQUAL(m_encodedId & kReservedMask, 0, ());
CHECK_NOT_EQUAL(m_encodedId & kTypeMask, 0, ());
CHECK_EQUAL(m_encodedId & kReservedMask, 0, ());
return m_encodedId & kSerialMask;
}
@ -36,7 +35,7 @@ uint64_t GeoObjectId::GetEncodedId() const { return m_encodedId; }
GeoObjectId::Type GeoObjectId::GetType() const
{
ASSERT_EQUAL(m_encodedId & kReservedMask, 0, ());
CHECK_EQUAL(m_encodedId & kReservedMask, 0, ());
uint64_t const typeBits = (m_encodedId & kTypeMask) >> 56;
switch (typeBits)
{
@ -71,7 +70,6 @@ GeoObjectId MakeOsmRelation(uint64_t id)
std::string DebugPrint(GeoObjectId::Type const & t)
{
UNUSED_VALUE(kReservedMask);
switch (t)
{
case GeoObjectId::Type::Invalid: return "Invalid";