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

[ugc] build fix + warning fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-10-12 16:11:17 +03:00 • committed by Roman Kuznetsov
parent 56fcdcabba
commit ebe90adad2
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coding/csv_reader.hpp
View file

@ -35,7 +35,7 @@ public:
template <typename Callback>
void Read(Reader const & reader, Callback const & fn, Params const & params = {}) const
{
std::string str(reader.Size(), '\0');
std::string str(static_cast<size_t>(reader.Size()), '\0');
reader.Read(0, &str[0], reader.Size());
std::istringstream stream(str);
Read(stream, fn, params);

2
indexer/ftraits.hpp
View file

@ -50,7 +50,7 @@ using UGCRatingCategories = std::vector<std::string>;
struct UGCItem
{
UGCItem() = default;
UGCItem() {}
UGCItem(UGCTypeMask m, UGCRatingCategories && c)
: m_mask(m), m_categories(std::move(c))
{

6
ugc/storage.cpp
View file

@ -93,7 +93,7 @@ UGCUpdate Storage::GetUGCUpdate(FeatureID const & id) const
return {};
auto const offset = index->m_offset;
auto const size = UGCSizeAtIndex(distance(m_UGCIndexes.begin(), index));
auto const size = static_cast<size_t>(UGCSizeAtIndex(distance(m_UGCIndexes.begin(), index)));
vector<uint8_t> buf;
buf.resize(size);
auto const ugcFilePath = GetUGCFilePath();
@ -222,7 +222,7 @@ void Storage::Defragmentation()
continue;
auto const offset = index.m_offset;
auto const size = UGCSizeAtIndex(i);
auto const size = static_cast<size_t>(UGCSizeAtIndex(i));
vector<uint8_t> buf;
buf.resize(size);
r.Read(offset, buf.data(), size);
@ -269,7 +269,7 @@ string Storage::GetUGCToSend() const
continue;
auto const offset = index.m_offset;
auto const bufSize = UGCSizeAtIndex(i);
auto const bufSize = static_cast<size_t>(UGCSizeAtIndex(i));
buf.resize(bufSize);
try
{