diff options
author | Yuri Gorshenin <y@maps.me> | 2015-07-27 13:25:24 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:57:40 +0300 |
commit | 04142e39cffd676d234f2a3b39de774500c6a66e (patch) | |
tree | 4cc8006430e0a9f2b31a472d6f338ad2dcb43174 /platform/country_defines.cpp | |
parent | acb80ad11be5e7431cf31fac57bbe104886e3ef6 (diff) |
Removed T-letter from TMapOptions.
Diffstat (limited to 'platform/country_defines.cpp')
-rw-r--r-- | platform/country_defines.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/platform/country_defines.cpp b/platform/country_defines.cpp index 05605e7ee0..bbbf933a2a 100644 --- a/platform/country_defines.cpp +++ b/platform/country_defines.cpp @@ -2,43 +2,43 @@ #include "base/assert.hpp" -bool HasOptions(TMapOptions mask, TMapOptions options) +bool HasOptions(MapOptions mask, MapOptions options) { return (static_cast<uint8_t>(mask) & static_cast<uint8_t>(options)) == static_cast<uint8_t>(options); } -TMapOptions IntersectOptions(TMapOptions lhs, TMapOptions rhs) +MapOptions IntersectOptions(MapOptions lhs, MapOptions rhs) { - return static_cast<TMapOptions>(static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs)); + return static_cast<MapOptions>(static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs)); } -TMapOptions SetOptions(TMapOptions mask, TMapOptions options) +MapOptions SetOptions(MapOptions mask, MapOptions options) { - return static_cast<TMapOptions>(static_cast<uint8_t>(mask) | static_cast<uint8_t>(options)); + return static_cast<MapOptions>(static_cast<uint8_t>(mask) | static_cast<uint8_t>(options)); } -TMapOptions UnsetOptions(TMapOptions mask, TMapOptions options) +MapOptions UnsetOptions(MapOptions mask, MapOptions options) { - return static_cast<TMapOptions>(static_cast<uint8_t>(mask) & ~static_cast<uint8_t>(options)); + return static_cast<MapOptions>(static_cast<uint8_t>(mask) & ~static_cast<uint8_t>(options)); } -TMapOptions LeastSignificantOption(TMapOptions mask) +MapOptions LeastSignificantOption(MapOptions mask) { - return static_cast<TMapOptions>(static_cast<uint8_t>(mask) & -static_cast<uint8_t>(mask)); + return static_cast<MapOptions>(static_cast<uint8_t>(mask) & -static_cast<uint8_t>(mask)); } -string DebugPrint(TMapOptions options) +string DebugPrint(MapOptions options) { switch (options) { - case TMapOptions::Nothing: + case MapOptions::Nothing: return "Nothing"; - case TMapOptions::Map: + case MapOptions::Map: return "MapOnly"; - case TMapOptions::CarRouting: + case MapOptions::CarRouting: return "CarRouting"; - case TMapOptions::MapWithCarRouting: + case MapOptions::MapWithCarRouting: return "MapWithCarRouting"; } } |