From b7bb3eada5c4d2af66cf0eb03cb3b4a59ad5173c Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Tue, 29 Nov 2016 20:17:39 +0300
Subject: [PATCH] [build] Fixed build on linux gcc 4.9

---
 partners_api/booking_api.cpp | 2 +-
 platform/network_policy.hpp  | 2 +-
 routing/routing_session.cpp  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/partners_api/booking_api.cpp b/partners_api/booking_api.cpp
index 201f2cafbd..23564f07f5 100644
--- a/partners_api/booking_api.cpp
+++ b/partners_api/booking_api.cpp
@@ -11,7 +11,7 @@
 
 #include "private.h"
 
-char const BookingApi::kDefaultCurrency[1];
+char constexpr BookingApi::kDefaultCurrency[1];
 
 BookingApi::BookingApi() : m_affiliateId(BOOKING_AFFILIATE_ID), m_testingMode(false)
 {
diff --git a/platform/network_policy.hpp b/platform/network_policy.hpp
index da732e35b4..e48ad3daa9 100644
--- a/platform/network_policy.hpp
+++ b/platform/network_policy.hpp
@@ -25,7 +25,7 @@ class NetworkPolicy
   friend NetworkPolicy ToNativeNetworkPolicy(jobject obj);
 
   // iOS
-  friend void network_policy::CallPartnersApi(PartnersApiFn fn, bool force);
+  friend void network_policy::CallPartnersApi(platform::PartnersApiFn fn, bool force);
 
 public:
   enum class Stage
diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp
index cca937ec48..ffda8c3c89 100644
--- a/routing/routing_session.cpp
+++ b/routing/routing_session.cpp
@@ -420,7 +420,7 @@ void RoutingSession::MatchLocationToRoute(location::GpsInfo & location,
 
 bool RoutingSession::DisableFollowMode()
 {
-  LOG(LINFO, ("Routing disables a following mode. State: ", m_state));
+  LOG(LINFO, ("Routing disables a following mode. State: ", m_state.load()));
   if (m_state == RouteNotStarted || m_state == OnRoute)
   {
     SetState(RouteNoFollowing);
@@ -432,7 +432,7 @@ bool RoutingSession::DisableFollowMode()
 
 bool RoutingSession::EnableFollowMode()
 {
-  LOG(LINFO, ("Routing enables a following mode. State: ", m_state));
+  LOG(LINFO, ("Routing enables a following mode. State: ", m_state.load()));
   if (m_state == RouteNotStarted || m_state == OnRoute)
   {
     SetState(OnRoute);