summaryrefslogtreecommitdiffstats
path: root/libs/hwui/utils
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-03-13 15:07:52 -0700
committerChris Craik <ccraik@google.com>2015-03-18 16:10:24 -0700
commite2bb380bc26749782c873e5488cfdf4e42b27346 (patch)
tree3e05a9dfe166da3649ac2f1673274785233d6912 /libs/hwui/utils
parent8c6e4b398040ec0b52a7cc0cef54728f126e3841 (diff)
downloadframeworks_base-e2bb380bc26749782c873e5488cfdf4e42b27346.zip
frameworks_base-e2bb380bc26749782c873e5488cfdf4e42b27346.tar.gz
frameworks_base-e2bb380bc26749782c873e5488cfdf4e42b27346.tar.bz2
Use glops for text rendering
Change-Id: I5e155c8baf3149f0ff231ec3c89dbff6bb8eae92
Diffstat (limited to 'libs/hwui/utils')
-rw-r--r--libs/hwui/utils/Macros.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/utils/Macros.h b/libs/hwui/utils/Macros.h
index 9f7ac1c..1b31059 100644
--- a/libs/hwui/utils/Macros.h
+++ b/libs/hwui/utils/Macros.h
@@ -36,8 +36,8 @@
#Type " must have standard layout")
#define MAKE_FLAGS_ENUM(enumType) \
- inline int operator|=(int lhs, enumType rhs) { \
- return 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); \
@@ -48,8 +48,8 @@
inline int operator|(enumType lhs, enumType rhs) { \
return static_cast<int>(lhs) | static_cast<int>(rhs); \
} \
- inline int operator&=(int lhs, enumType rhs) { \
- return 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); \