diff options
| author | Chris Craik <ccraik@google.com> | 2015-06-02 17:40:58 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-06-03 13:42:21 -0700 |
| commit | 1b54fb27ac48495ed0b33868fda5776fb49fe0f3 (patch) | |
| tree | 5e4c41e89b3065437c0e778a73a041cdffed1932 /libs/hwui/utils/Macros.h | |
| parent | 4575acf1e72827dd6fd6cb645abfb3ba9043fa47 (diff) | |
| download | frameworks_base-1b54fb27ac48495ed0b33868fda5776fb49fe0f3.zip frameworks_base-1b54fb27ac48495ed0b33868fda5776fb49fe0f3.tar.gz frameworks_base-1b54fb27ac48495ed0b33868fda5776fb49fe0f3.tar.bz2 | |
Delete MAKE_ENUM_FLAGS
bug:21595702
Settle on namespace-enum for consistency. Also removes k prefix.
Change-Id: Ib89f94cb9263de40b6e4636577dca4860867d0d8
Diffstat (limited to 'libs/hwui/utils/Macros.h')
| -rw-r--r-- | libs/hwui/utils/Macros.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/libs/hwui/utils/Macros.h b/libs/hwui/utils/Macros.h index 1b31059..5ca9083 100644 --- a/libs/hwui/utils/Macros.h +++ b/libs/hwui/utils/Macros.h @@ -35,30 +35,4 @@ static_assert(std::is_standard_layout<Type>::value, \ #Type " must have standard layout") -#define MAKE_FLAGS_ENUM(enumType) \ - inline void operator|=(int& lhs, enumType rhs) { \ - lhs |= static_cast<int>(rhs); \ - } \ - inline int operator|(int lhs, enumType rhs) { \ - return lhs | static_cast<int>(rhs); \ - } \ - inline int operator|(enumType lhs, int rhs) { \ - return static_cast<int>(lhs) | rhs; \ - } \ - inline int operator|(enumType lhs, enumType rhs) { \ - return static_cast<int>(lhs) | static_cast<int>(rhs); \ - } \ - inline void operator&=(int& lhs, enumType rhs) { \ - lhs &= static_cast<int>(rhs); \ - } \ - inline int operator&(int lhs, enumType rhs) { \ - return lhs & static_cast<int>(rhs); \ - } \ - inline int operator&(enumType lhs, int rhs) { \ - return static_cast<int>(lhs) & rhs; \ - } \ - inline int operator&(enumType lhs, enumType rhs) { \ - return static_cast<int>(lhs) & static_cast<int>(rhs); \ - } - #endif /* MACROS_H */ |