diff options
| author | Alex Zolotarev <alex@maps.me> | 2015-07-16 18:24:20 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:56:24 +0300 |
| commit | 5f761e7a0ef346d88fa4643a4183580ad94ba331 (patch) | |
| tree | 8948159a78209e5cc844c553fcd556eaa7ad3f2e /platform/country_defines.cpp | |
| parent | f50ed69e87e037c519f2ede59aea582f30c6980a (diff) | |
Merge pull request #1218 from gorshenin/cancel-downloading-bugfix
[storage, bugfix in release] Fixed cancel of downloading.
Diffstat (limited to 'platform/country_defines.cpp')
| -rw-r--r-- | platform/country_defines.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/platform/country_defines.cpp b/platform/country_defines.cpp index 927f883709..8ee9691ae5 100644 --- a/platform/country_defines.cpp +++ b/platform/country_defines.cpp @@ -8,6 +8,11 @@ bool HasOptions(TMapOptions mask, TMapOptions options) static_cast<uint8_t>(options); } +TMapOptions IntersectOptions(TMapOptions lhs, TMapOptions rhs) +{ + return static_cast<TMapOptions>(static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs)); +} + TMapOptions SetOptions(TMapOptions mask, TMapOptions options) { return static_cast<TMapOptions>(static_cast<uint8_t>(mask) | static_cast<uint8_t>(options)); |