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:
authorAlex Zolotarev <deathbaba@gmail.com>2011-10-03 05:11:59 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:25:03 +0300
commit1e40e08c61b59ec42a3728894f54c1ac37977bed (patch)
treea12a4f7f95d5d870488190856fac0d37a7da1eea /indexer/feature_utils.cpp
parent8f57de60663b9d940ead618509021537eec8ac91 (diff)
[mac] Fixed build errors
Diffstat (limited to 'indexer/feature_utils.cpp')
-rw-r--r--indexer/feature_utils.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp
index 71a1930231..024525eed9 100644
--- a/indexer/feature_utils.cpp
+++ b/indexer/feature_utils.cpp
@@ -1,5 +1,7 @@
#include "feature_utils.hpp"
#include "classificator.hpp"
+#include "feature.hpp"
+
#include "../geometry/point2d.hpp"
#include "../base/base.hpp"
#include "../std/vector.hpp"
@@ -47,24 +49,24 @@ public:
uint8_t GetSearchRank(FeatureType const & feature) const
{
- uint32_t const population = feature.GetPopulation();
+ uint32_t population = feature.GetPopulation();
FeatureBase::GetTypesFn types;
feature.ForEachTypeRef(types);
for (size_t i = 0; i < types.m_size; ++i)
{
if (types.m_types[i] == m_TypeVillage)
- population = max(population, 1000);
+ population = max(population, static_cast<uint32_t>(1000));
else if (types.m_types[i] == m_TypeTown)
- population = max(population, 10000);
+ population = max(population, static_cast<uint32_t>(10000));
else if (types.m_types[i] == m_TypeCity)
- population = max(population, 100000);
+ population = max(population, static_cast<uint32_t>(100000));
else if (types.m_types[i] == m_TypeCityCapital)
- population = max(population, 1000000);
+ population = max(population, static_cast<uint32_t>(1000000));
else if (types.m_types[i] == m_TypeCountry)
- population = max(population, 2000000);
+ population = max(population, static_cast<uint32_t>(2000000));
else if (types.m_types[i] == m_TypeContinent)
- population = max(population, 20000000);
+ population = max(population, static_cast<uint32_t>(20000000));
}
return static_cast<uint8_t>(log(double(population)) / log(1.1));