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

Warning fixed.

Browse source
This commit is contained in:
Daria Volvenkova 2018-02-19 14:46:30 +03:00 • committed by Roman Kuznetsov
parent 3b0a5bbfc5
commit 9d45647828
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
map/bookmark_manager.cpp
View file

@ -185,7 +185,6 @@ Bookmark * BookmarkManager::CreateBookmark(m2::PointD const & ptOrg, BookmarkDat
Bookmark * BookmarkManager::CreateBookmark(m2::PointD const & ptOrg, BookmarkData & bm, df::MarkGroupID groupId)
{
// TODO(darina): Do we need this event?
GetPlatform().GetMarketingService().SendMarketingEvent(marketing::kBookmarksBookmarkAction,
{{"action", "create"}});
@ -898,7 +897,6 @@ void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool
}
if (merge)
{
// TODO(darina): Change the order.
// Delete file since it will be merged.
my::DeleteFileX(data->m_file);
SaveToKMLFile(groupId);

2
map/user_mark.cpp
View file

@ -17,7 +17,7 @@ df::MarkID GetNextUserMarkId(UserMark::Type type)
{
static std::atomic<uint32_t> nextMarkId(0);
ASSERT_LESS(type, 1 << kMarkIdTypeBitsCount, ());
static_assert(UserMark::Type::BOOKMARK < (1 << kMarkIdTypeBitsCount), "Not enough bits for user mark type.");
return static_cast<df::MarkID>(
(++nextMarkId) | (type << static_cast<uint32_t>(sizeof(df::MarkID) * 8 - kMarkIdTypeBitsCount)));
}