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

[build] Fixed build on linux gcc 4.9

Browse source
This commit is contained in:
Ilya Zverev 2016-11-29 20:17:39 +03:00
parent 97bd14f752
commit b7bb3eada5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
partners_api/booking_api.cpp
View file

@ -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)
{

2
platform/network_policy.hpp
View file

@ -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

4
routing/routing_session.cpp
View file

@ -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);