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:
authorRoman Kuznetsov <r.kuznetsow@gmail.com>2017-06-13 15:58:44 +0300
committerGitHub <noreply@github.com>2017-06-13 15:58:44 +0300
commit4941fdb4fd4ec22668793cc960c0b2d44b7408b3 (patch)
tree62fa2f699040f0ff90cd65a71d24c2b4cf2dd2c2
parentc2247fccc3076b59732f642bfe671c837198ea8f (diff)
parent0a14392768aa55be21335e8522d876136e70ff2f (diff)
Merge pull request #6245 from bykoianko/release-73-warning-fix
Warning fix.
-rw-r--r--map/framework.cpp1
-rw-r--r--routing/turns.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/map/framework.cpp b/map/framework.cpp
index 542f853a1a..b0c90ebad7 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -126,7 +126,6 @@ Framework::FixedPosition::FixedPosition()
namespace
{
static const int BM_TOUCH_PIXEL_INCREASE = 20;
-static const int kKeepPedestrianDistanceMeters = 10000;
char const kRouterTypeKey[] = "router";
char const kMapStyleKey[] = "MapStyleKeyV1";
char const kAllow3dKey[] = "Allow3d";
diff --git a/routing/turns.cpp b/routing/turns.cpp
index e77c4dd65b..810720eb8a 100644
--- a/routing/turns.cpp
+++ b/routing/turns.cpp
@@ -132,7 +132,7 @@ FeatureID const & UniNodeId::GetFeature() const
bool UniNodeId::IsCorrect() const
{
return m_type == Type::Mwm &&
- (m_forward && m_startSegId <= m_endSegId || !m_forward && m_endSegId <= m_startSegId);
+ ((m_forward && m_startSegId <= m_endSegId) || (!m_forward && m_endSegId <= m_startSegId));
}
string DebugPrint(UniNodeId::Type type)