From e2bb380bc26749782c873e5488cfdf4e42b27346 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Fri, 13 Mar 2015 15:07:52 -0700 Subject: Use glops for text rendering Change-Id: I5e155c8baf3149f0ff231ec3c89dbff6bb8eae92 --- libs/hwui/utils/Macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/hwui/utils') 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(rhs); \ + inline void operator|=(int& lhs, enumType rhs) { \ + lhs |= static_cast(rhs); \ } \ inline int operator|(int lhs, enumType rhs) { \ return lhs | static_cast(rhs); \ @@ -48,8 +48,8 @@ inline int operator|(enumType lhs, enumType rhs) { \ return static_cast(lhs) | static_cast(rhs); \ } \ - inline int operator&=(int lhs, enumType rhs) { \ - return lhs & static_cast(rhs); \ + inline void operator&=(int& lhs, enumType rhs) { \ + lhs &= static_cast(rhs); \ } \ inline int operator&(int lhs, enumType rhs) { \ return lhs & static_cast(rhs); \ -- cgit v1.1