From 8251833005685d106093e2ef26b0b893efd97fac Mon Sep 17 00:00:00 2001
From: "Evgeniy A. Dushistov" <dushistov@mail.ru>
Date: Mon, 21 Sep 2020 14:17:02 +0300
Subject: [PATCH] [map] remove last usage of boost::optional

---
 map/isolines_manager.cpp                   | 4 ++--
 map/isolines_manager.hpp                   | 5 ++---
 map/notifications/notification_manager.hpp | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/map/isolines_manager.cpp b/map/isolines_manager.cpp
index 318c15e822..8e604045ee 100644
--- a/map/isolines_manager.cpp
+++ b/map/isolines_manager.cpp
@@ -95,7 +95,7 @@ void IsolinesManager::UpdateViewport(ScreenBase const & screen)
   if (screen.GlobalRect().GetLocalRect().IsEmptyInterior())
     return;
 
-  m_currentModelView.reset(screen);
+  m_currentModelView = screen;
   if (!IsEnabled())
     return;
 
@@ -171,7 +171,7 @@ void IsolinesManager::Invalidate()
     return;
   m_lastMwms.clear();
   if (m_currentModelView)
-    UpdateViewport(m_currentModelView.get());
+    UpdateViewport(*m_currentModelView);
 }
 
 isolines::Quality IsolinesManager::GetDataQuality(MwmSet::MwmId const & id) const
diff --git a/map/isolines_manager.hpp b/map/isolines_manager.hpp
index 52f286d7e0..3acae9f47b 100644
--- a/map/isolines_manager.hpp
+++ b/map/isolines_manager.hpp
@@ -16,11 +16,10 @@
 #include <cstdint>
 #include <functional>
 #include <map>
+#include <optional>
 #include <set>
 #include <string>
 
-#include <boost/optional.hpp>
-
 class IsolinesManager final
 {
 public:
@@ -86,7 +85,7 @@ private:
 
   df::DrapeEngineSafePtr m_drapeEngine;
 
-  boost::optional<ScreenBase> m_currentModelView;
+  std::optional<ScreenBase> m_currentModelView;
 
   std::vector<MwmSet::MwmId> m_lastMwms;
   mutable std::map<MwmSet::MwmId, Info> m_mwmCache;
diff --git a/map/notifications/notification_manager.hpp b/map/notifications/notification_manager.hpp
index e20108a760..2738165b67 100644
--- a/map/notifications/notification_manager.hpp
+++ b/map/notifications/notification_manager.hpp
@@ -12,8 +12,6 @@
 #include <string>
 #include <unordered_set>
 
-#include <boost/optional.hpp>
-
 namespace ugc
 {
 class Api;