Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Yershov <yershov@corp.mail.ru>2015-03-17 16:04:42 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:39:56 +0300
commit3848db2389318c41b7c29a74cf9e5f2ba7e331dc (patch)
treed2716c5a3d833c768dd4f94b22944c1fee18f822 /indexer/feature_loader.cpp
parenta97b51a6aaa759dc584f6f133d7aeee739aad62c (diff)
fixed warning in [indexer]
Diffstat (limited to 'indexer/feature_loader.cpp')
-rw-r--r--indexer/feature_loader.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/indexer/feature_loader.cpp b/indexer/feature_loader.cpp
index 55664f903a..2af1614771 100644
--- a/indexer/feature_loader.cpp
+++ b/indexer/feature_loader.cpp
@@ -140,7 +140,7 @@ void LoaderCurrent::ParseHeader2()
src = ArrayByteSource(serial::LoadInnerPath(start, ptsCount, cp, m_pF->m_points));
- m_pF->m_innerStats.m_points = src.PtrC() - start;
+ m_pF->m_innerStats.m_points = static_cast<uint32_t>(src.PtrC() - start);
}
else
{
@@ -160,7 +160,7 @@ void LoaderCurrent::ParseHeader2()
FeatureType::points_t points;
src = ArrayByteSource(serial::LoadInnerTriangles(start, trgCount, cp, points));
- m_pF->m_innerStats.m_strips = src.PtrC() - start;
+ m_pF->m_innerStats.m_strips = static_cast<uint32_t>(src.PtrC() - start);
for (uint8_t i = 2; i < trgCount; ++i)
{
@@ -173,7 +173,7 @@ void LoaderCurrent::ParseHeader2()
ReadOffsets(src, trgMask, m_trgOffsets);
}
- m_pF->m_innerStats.m_size = src.PtrC() - DataPtr();
+ m_pF->m_innerStats.m_size = static_cast<uint32_t>(src.PtrC() - DataPtr());
}
uint32_t LoaderCurrent::ParseGeometry(int scale)
@@ -259,7 +259,8 @@ void LoaderCurrent::ParseMetadata()
typedef pair<uint32_t, uint32_t> IdxElementT;
DDVector<IdxElementT, FilesContainerR::ReaderT> idx(m_Info.GetMetadataIndexReader());
- auto it = lower_bound(idx.begin(), idx.end()
+ auto it = lower_bound(idx.begin(),
+ idx.end()
, make_pair(uint32_t(m_pF->m_id.m_offset), uint32_t(0))
, [](IdxElementT const & v1, IdxElementT const & v2) { return v1.first < v2.first; }
);