From 5f761e7a0ef346d88fa4643a4183580ad94ba331 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 16 Jul 2015 18:24:20 +0300 Subject: Merge pull request #1218 from gorshenin/cancel-downloading-bugfix [storage, bugfix in release] Fixed cancel of downloading. --- platform/country_defines.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'platform/country_defines.cpp') 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(options); } +TMapOptions IntersectOptions(TMapOptions lhs, TMapOptions rhs) +{ + return static_cast(static_cast(lhs) & static_cast(rhs)); +} + TMapOptions SetOptions(TMapOptions mask, TMapOptions options) { return static_cast(static_cast(mask) | static_cast(options)); -- cgit v1.2.3