Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladiMihaylenko <vxmihaylenko@gmail.com>2017-08-30 18:00:57 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2017-09-13 16:25:48 +0300
commit4265c34d5bc24ff5879d7770a0390681efe84e1b (patch)
treec6224c0f335f4c7a28bd64f3aad02eff7d472ab1 /platform
parent3af5ad4c4bc06711c395dd8233257de77c6b74f4 (diff)
Fixed canceling of diff download.
Diffstat (limited to 'platform')
-rw-r--r--platform/country_defines.cpp5
-rw-r--r--platform/country_defines.hpp2
2 files changed, 0 insertions, 7 deletions
diff --git a/platform/country_defines.cpp b/platform/country_defines.cpp
index 4f1072a466..d6ab946822 100644
--- a/platform/country_defines.cpp
+++ b/platform/country_defines.cpp
@@ -8,11 +8,6 @@ bool HasOptions(MapOptions mask, MapOptions options)
static_cast<uint8_t>(options);
}
-MapOptions IntersectOptions(MapOptions lhs, MapOptions rhs)
-{
- return static_cast<MapOptions>(static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs));
-}
-
MapOptions SetOptions(MapOptions mask, MapOptions options)
{
return static_cast<MapOptions>(static_cast<uint8_t>(mask) | static_cast<uint8_t>(options));
diff --git a/platform/country_defines.hpp b/platform/country_defines.hpp
index e9a123bc8a..e5b9a08804 100644
--- a/platform/country_defines.hpp
+++ b/platform/country_defines.hpp
@@ -18,8 +18,6 @@ using TLocalAndRemoteSize = pair<TMwmSize, TMwmSize>;
bool HasOptions(MapOptions mask, MapOptions options);
-MapOptions IntersectOptions(MapOptions lhs, MapOptions rhs);
-
MapOptions SetOptions(MapOptions mask, MapOptions options);
MapOptions UnsetOptions(MapOptions mask, MapOptions options);