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 <syershov@maps.me>2017-01-13 13:48:35 +0300
committerSergey Yershov <syershov@maps.me>2017-01-13 19:09:10 +0300
commitb449b488587ed836adad64a198f1cf8707714c74 (patch)
tree2379d851e2ba59039cd0b56abd3f0a559f276fbe /indexer/drules_selector.cpp
parentf7efe4fd53d99a2d0b178abc24ff0ad2c2a0dcb5 (diff)
Fix warnings.
Diffstat (limited to 'indexer/drules_selector.cpp')
-rw-r--r--indexer/drules_selector.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indexer/drules_selector.cpp b/indexer/drules_selector.cpp
index bacc660246..99c0e1f3c9 100644
--- a/indexer/drules_selector.cpp
+++ b/indexer/drules_selector.cpp
@@ -97,7 +97,7 @@ private:
};
// Feature tag value evaluator for tag 'population'
-bool GetPopulation(FeatureType const & ft, uint32_t & population)
+bool GetPopulation(FeatureType const & ft, uint64_t & population)
{
population = ftypes::GetPopulation(ft);
return true;
@@ -139,14 +139,14 @@ unique_ptr<ISelector> ParseSelector(string const & str)
if (e.m_tag == "population")
{
- int value = 0;
- if (!e.m_value.empty() && (!strings::to_int(e.m_value, value) || value < 0))
+ uint64_t value = 0;
+ if (!e.m_value.empty() && !strings::to_uint64(e.m_value, value))
{
// bad string format
LOG(LDEBUG, ("Invalid selector:", str));
return unique_ptr<ISelector>();
}
- return make_unique<Selector<uint32_t>>(&GetPopulation, e.m_operator, static_cast<uint32_t>(value));
+ return make_unique<Selector<uint64_t>>(&GetPopulation, e.m_operator, value);
}
else if (e.m_tag == "name")
{