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

Compilation fixes with some minor changes.

Browse source
This commit is contained in:
vng 2012-09-26 03:35:59 +03:00 • committed by Alex Zolotarev
parent 0b94624aa9
commit 03423c4e03
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
coding/dd_vector.hpp
View file

@ -166,10 +166,11 @@ public:
private:
void InitSize()
{
if ((m_reader.Size() % sizeof(T)) != 0)
MYTHROW(OpenException, (m_reader.Size(), sizeof(T)));
// TODO: Check that reader.Size() % sizeof(T) == 0
m_Size = m_reader.Size() / sizeof(T);
uint64_t const sz = m_reader.Size();
if ((sz % sizeof(T)) != 0)
MYTHROW(OpenException, (sz, sizeof(T)));
m_Size = sz / sizeof(T);
}
// TODO: Refactor me to use Reader by pointer.

2
indexer/scale_index_builder.hpp
View file

@ -148,7 +148,7 @@ inline void IndexScales(uint32_t bucketsCount,
{
FileReader reader(tmpFilePrefix + ".c2f.sorted");
uint64_t const numCells = reader.Size() / sizeof(CellFeaturePair);
DDVector<CellFeaturePair, FileReader, uint64_t> cellsToFeatures(reader, numCells);
DDVector<CellFeaturePair, FileReader, uint64_t> cellsToFeatures(reader);
LOG(LINFO, ("Being indexed", "features:", numFeatures, "cells:", numCells,
"cells per feature:", (numCells + 1.0) / (numFeatures + 1.0)));
SubWriter<WriterT> subWriter(writer);

3
platform/preferred_languages.hpp
View file

@ -5,9 +5,12 @@
namespace languages
{
/// @note This functions are heavy enough to call them often. Be careful.
//@{
/// @return system language preferences in the form "en|ru|es|zh"
string PreferredLanguages();
/// @return language code for current user in the form "en"
string CurrentLanguage();
//@}
}