From 940ff51457299db4187c12497cca21c50d665b6b Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Wed, 2 Oct 2019 15:22:04 +0300
Subject: [PATCH] [storage] got rid unused mapoptions

---
 platform/country_defines.cpp | 33 ++-------------------------------
 platform/country_defines.hpp | 17 +++--------------
 2 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/platform/country_defines.cpp b/platform/country_defines.cpp
index 2f12cf48bc..9d2f16aabb 100644
--- a/platform/country_defines.cpp
+++ b/platform/country_defines.cpp
@@ -2,41 +2,12 @@
 
 #include "base/assert.hpp"
 
-bool HasOptions(MapOptions mask, MapOptions options)
-{
-  return (static_cast<uint8_t>(mask) & static_cast<uint8_t>(options)) ==
-         static_cast<uint8_t>(options);
-}
-
-MapOptions SetOptions(MapOptions mask, MapOptions options)
-{
-  return static_cast<MapOptions>(static_cast<uint8_t>(mask) | static_cast<uint8_t>(options));
-}
-
-MapOptions UnsetOptions(MapOptions mask, MapOptions options)
-{
-  return static_cast<MapOptions>(static_cast<uint8_t>(mask) & ~static_cast<uint8_t>(options));
-}
-
-MapOptions LeastSignificantOption(MapOptions mask)
-{
-  return static_cast<MapOptions>(static_cast<uint8_t>(mask) & -static_cast<uint8_t>(mask));
-}
-
 std::string DebugPrint(MapOptions options)
 {
   switch (options)
   {
-    case MapOptions::Nothing:
-      return "Nothing";
-    case MapOptions::Map:
-      return "MapOnly";
-    case MapOptions::CarRouting:
-      return "CarRouting";
-    case MapOptions::MapWithCarRouting:
-      return "MapWithCarRouting";
-    case MapOptions::Diff:
-      return "Diff";
+  case MapOptions::Map: return "MapOnly";
+  case MapOptions::Diff: return "Diff";
   }
   UNREACHABLE();
 }
diff --git a/platform/country_defines.hpp b/platform/country_defines.hpp
index cdddafe060..85fc31a31e 100644
--- a/platform/country_defines.hpp
+++ b/platform/country_defines.hpp
@@ -8,25 +8,14 @@
 // value when count of elements is changed.
 enum class MapOptions : uint8_t
 {
-  Nothing = 0x0,
-  Map = 0x1,
-  CarRouting = 0x2,
-  MapWithCarRouting = 0x3,
-  Diff = 0x4
+  Map,
+  Diff
 };
 
-uint8_t constexpr kMapOptionsCount = 5;
+uint8_t constexpr kMapOptionsCount = 2;
 
 using MwmCounter = uint32_t;
 using MwmSize = uint64_t;
 using LocalAndRemoteSize = std::pair<MwmSize, MwmSize>;
 
-bool HasOptions(MapOptions mask, MapOptions options);
-
-MapOptions SetOptions(MapOptions mask, MapOptions options);
-
-MapOptions UnsetOptions(MapOptions mask, MapOptions options);
-
-MapOptions LeastSignificantOption(MapOptions mask);
-
 std::string DebugPrint(MapOptions options);