From 5e9219293d0cfbef800f37a1b740b618cf5a61c2 Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Mon, 14 Sep 2015 12:22:58 +0300
Subject: [PATCH] Fixed compilation on Linux

---
 drape_frontend/gui/drape_gui.cpp | 7 +++++++
 drape_frontend/gui/drape_gui.hpp | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drape_frontend/gui/drape_gui.cpp b/drape_frontend/gui/drape_gui.cpp
index f716bc78be..e3a565edc0 100644
--- a/drape_frontend/gui/drape_gui.cpp
+++ b/drape_frontend/gui/drape_gui.cpp
@@ -56,9 +56,16 @@ void DrapeGui::Destroy()
 
 void DrapeGui::SetSurfaceSize(m2::PointF const & size)
 {
+  lock_guard<mutex> lock(m_surfaceSizeMutex);
   m_surfaceSize = size;
 }
 
+m2::PointF DrapeGui::GetSurfaceSize() const
+{
+  lock_guard<mutex> lock(m_surfaceSizeMutex);
+  return m_surfaceSize;
+}
+
 void DrapeGui::SetLocalizator(const DrapeGui::TLocalizeStringFn & fn)
 {
   ASSERT(m_impl != nullptr, ());
diff --git a/drape_frontend/gui/drape_gui.hpp b/drape_frontend/gui/drape_gui.hpp
index 3ee85705da..4e4b35ad35 100644
--- a/drape_frontend/gui/drape_gui.hpp
+++ b/drape_frontend/gui/drape_gui.hpp
@@ -11,7 +11,7 @@
 
 #include "std/function.hpp"
 #include "std/unique_ptr.hpp"
-#include "std/atomic.hpp"
+#include "std/mutex.hpp"
 
 class ScreenBase;
 
@@ -36,7 +36,7 @@ public:
   void SetLocalizator(TLocalizeStringFn const & fn);
   void Destroy();
   void SetSurfaceSize(m2::PointF const & size);
-  m2::PointF GetSurfaceSize() const { return m_surfaceSize; }
+  m2::PointF GetSurfaceSize() const;
 
   string GetLocalizedString(string const & stringID) const;
 
@@ -69,7 +69,8 @@ private:
 
   Shape::TTapHandler m_onCompassTappedHandler;
   CountryStatus::TButtonHandlers m_buttonHandlers;
-  atomic<m2::PointF> m_surfaceSize;
+  m2::PointF m_surfaceSize;
+  mutable mutex m_surfaceSizeMutex;
   bool m_inUserAction = false;
 };