diff options
| author | Maxim Pimenov <m@maps.me> | 2019-05-14 20:17:52 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2019-05-15 13:35:08 +0300 |
| commit | c11c41d67738500b0d1eeea7170a775441578cae (patch) | |
| tree | 0f888fdd6ec1cef7baa4e32cde00d6dd608461e2 /map | |
| parent | 06978f4585c463e97db42f96e7140616061939c3 (diff) | |
Fixed some warnings.
Diffstat (limited to 'map')
| -rw-r--r-- | map/bookmark_manager.cpp | 10 | ||||
| -rw-r--r-- | map/bookmark_manager.hpp | 2 | ||||
| -rw-r--r-- | map/gps_track_storage.cpp | 2 | ||||
| -rw-r--r-- | map/notifications/notification_queue_storage.cpp | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp index 8d9284e6a0..f128afc515 100644 --- a/map/bookmark_manager.cpp +++ b/map/bookmark_manager.cpp @@ -1543,7 +1543,10 @@ UserMarkLayer const * BookmarkManager::GetGroup(kml::MarkGroupId groupId) const { CHECK_THREAD_CHECKER(m_threadChecker, ()); if (groupId < UserMark::Type::USER_MARK_TYPES_COUNT) - return m_userMarkLayers[groupId - 1].get(); + { + CHECK_GREATER(groupId, 0, ()); + return m_userMarkLayers[static_cast<size_t>(groupId - 1)].get(); + } ASSERT(m_categories.find(groupId) != m_categories.end(), ()); return m_categories.at(groupId).get(); @@ -1553,7 +1556,10 @@ UserMarkLayer * BookmarkManager::GetGroup(kml::MarkGroupId groupId) { CHECK_THREAD_CHECKER(m_threadChecker, ()); if (groupId < UserMark::Type::USER_MARK_TYPES_COUNT) - return m_userMarkLayers[groupId - 1].get(); + { + CHECK_GREATER(groupId, 0, ()); + return m_userMarkLayers[static_cast<size_t>(groupId - 1)].get(); + } auto const it = m_categories.find(groupId); return it != m_categories.end() ? it->second.get() : nullptr; diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp index 8ba99468cb..05fd317366 100644 --- a/map/bookmark_manager.hpp +++ b/map/bookmark_manager.hpp @@ -395,7 +395,7 @@ private: ASSERT_LESS(groupId - 1, m_userMarkLayers.size(), ()); m_userMarks.emplace(markId, std::move(mark)); m_changesTracker.OnAddMark(markId); - m_userMarkLayers[groupId - 1]->AttachUserMark(markId); + m_userMarkLayers[static_cast<size_t>(groupId - 1)]->AttachUserMark(markId); return m; } diff --git a/map/gps_track_storage.cpp b/map/gps_track_storage.cpp index 6bdabddfd4..1afc5a69bf 100644 --- a/map/gps_track_storage.cpp +++ b/map/gps_track_storage.cpp @@ -125,7 +125,7 @@ GpsTrackStorage::GpsTrackStorage(string const & filePath, size_t maxItemCount) if (!m_stream.good()) MYTHROW(OpenException, ("Seek to the end error.", m_filePath)); - size_t const fileSize = m_stream.tellp(); + auto const fileSize = static_cast<size_t>(m_stream.tellp()); m_itemCount = GetItemCount(fileSize); diff --git a/map/notifications/notification_queue_storage.cpp b/map/notifications/notification_queue_storage.cpp index 733b906d31..36c033af38 100644 --- a/map/notifications/notification_queue_storage.cpp +++ b/map/notifications/notification_queue_storage.cpp @@ -57,7 +57,7 @@ bool QueueStorage::Load(std::vector<int8_t> & dst) FileReader reader(GetFilePath()); dst.clear(); - dst.resize(reader.Size()); + dst.resize(static_cast<size_t>(reader.Size())); reader.Read(0, dst.data(), dst.size()); } |