kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Minor code fixes.

Browse source
This commit is contained in:
vng 2015-07-08 19:02:53 +03:00 • committed by Alex Zolotarev
parent ba88809f5b
commit 177c80da94
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
indexer/features_offsets_table.cpp
View file

@ -13,7 +13,7 @@
namespace feature
{
void FeaturesOffsetsTable::Builder::PushOffset(uint32_t const offset)
void FeaturesOffsetsTable::Builder::PushOffset(uint32_t const offset)
{
ASSERT(m_offsets.empty() || m_offsets.back() < offset, ());
m_offsets.push_back(offset);

2
indexer/features_offsets_table.hpp
View file

@ -92,7 +92,7 @@ namespace feature
/// \return byte size of a table, may be slightly different from a
/// real byte size in memory or on disk due to alignment, but
/// can be used in benchmarks, logging, etc.
inline size_t byte_size() { return succinct::mapper::size_of(m_table); }
//inline size_t byte_size() { return static_cast<size_t>(succinct::mapper::size_of(m_table)); }
private:
FeaturesOffsetsTable(succinct::elias_fano::elias_fano_builder & builder);

2
routing/osrm2feature_map.hpp
View file

@ -166,7 +166,7 @@ public:
/// @return Node id for segment's index.
TOsrmNodeId GetNodeId(size_t segInd) const;
size_t GetSegmentsCount() const { return m_segments.size(); }
size_t GetSegmentsCount() const { return static_cast<size_t>(m_segments.size()); }
//@}
protected:

4
storage/storage.cpp
View file

@ -557,10 +557,8 @@ bool Storage::RegisterDownloadedFile(string const & path, uint64_t size, int64_t
{
QueuedCountry & queuedCountry = m_queue.front();
TIndex const & index = queuedCountry.GetIndex();
uint64_t const expectedSize = GetDownloadSize(queuedCountry);
ASSERT_EQUAL(size, expectedSize, ("Downloaded file size mismatch:", size,
"bytes were downloaded,", expectedSize, "bytes expected."));
ASSERT_EQUAL(size, GetDownloadSize(queuedCountry), ("Downloaded file size mismatch with expected"));
CountryFile const countryFile = GetCountryFile(index);
shared_ptr<LocalCountryFile> localFile = GetLocalFile(index, version);