diff options
author | Yuri Gorshenin <y@maps.me> | 2015-06-16 18:15:09 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:53:25 +0300 |
commit | 598e71858b63ef4e587efd932db41474f8f516a0 (patch) | |
tree | 19e39c1dd331579432c9b58e5e1e82c750842ac3 /platform/country_defines.cpp | |
parent | 9148053b3aa67aac443ade98e2ed2ae899419095 (diff) |
Storage redesign.
Diffstat (limited to 'platform/country_defines.cpp')
-rw-r--r-- | platform/country_defines.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/platform/country_defines.cpp b/platform/country_defines.cpp index 5a3ab9e8f5..927f883709 100644 --- a/platform/country_defines.cpp +++ b/platform/country_defines.cpp @@ -2,14 +2,25 @@ #include "base/assert.hpp" -bool HasOptions(TMapOptions options, TMapOptions bits) +bool HasOptions(TMapOptions mask, TMapOptions options) { - return (static_cast<uint8_t>(options) & static_cast<uint8_t>(bits)) == static_cast<uint8_t>(bits); + return (static_cast<uint8_t>(mask) & static_cast<uint8_t>(options)) == + static_cast<uint8_t>(options); } -TMapOptions SetOptions(TMapOptions options, TMapOptions bits) +TMapOptions SetOptions(TMapOptions mask, TMapOptions options) { - return static_cast<TMapOptions>(static_cast<uint8_t>(options) | static_cast<uint8_t>(bits)); + return static_cast<TMapOptions>(static_cast<uint8_t>(mask) | static_cast<uint8_t>(options)); +} + +TMapOptions UnsetOptions(TMapOptions mask, TMapOptions options) +{ + return static_cast<TMapOptions>(static_cast<uint8_t>(mask) & ~static_cast<uint8_t>(options)); +} + +TMapOptions LeastSignificantOption(TMapOptions mask) +{ + return static_cast<TMapOptions>(static_cast<uint8_t>(mask) & -static_cast<uint8_t>(mask)); } string DebugPrint(TMapOptions options) @@ -24,8 +35,5 @@ string DebugPrint(TMapOptions options) return "CarRouting"; case TMapOptions::EMapWithCarRouting: return "MapWithCarRouting"; - default: - ASSERT(false, ("Unknown TMapOptions (", static_cast<uint8_t>(options), ")")); - return string(); } } |