Index: src/base/flags.h |
diff --git a/src/base/flags.h b/src/base/flags.h |
index eb7358755f46bcde203cff195364aa6e1f00df4e..f3420ee536112f887b0cec648fb96a1e83170ca5 100644 |
--- a/src/base/flags.h |
+++ b/src/base/flags.h |
@@ -65,51 +65,38 @@ class Flags FINAL { |
#define DEFINE_OPERATORS_FOR_FLAGS(Type) \ |
- inline ::v8::base::Flags<Type::flag_type> operator&( \ |
- Type::flag_type lhs, \ |
- Type::flag_type rhs)ALLOW_UNUSED WARN_UNUSED_RESULT; \ |
- inline ::v8::base::Flags<Type::flag_type> operator&(Type::flag_type lhs, \ |
- Type::flag_type rhs) { \ |
- return ::v8::base::Flags<Type::flag_type>(lhs) & rhs; \ |
+ inline Type operator&(Type::flag_type lhs, \ |
+ Type::flag_type rhs)ALLOW_UNUSED WARN_UNUSED_RESULT; \ |
+ inline Type operator&(Type::flag_type lhs, Type::flag_type rhs) { \ |
+ return Type(lhs) & rhs; \ |
} \ |
- inline ::v8::base::Flags<Type::flag_type> operator&( \ |
- Type::flag_type lhs, const ::v8::base::Flags<Type::flag_type>& rhs) \ |
- ALLOW_UNUSED WARN_UNUSED_RESULT; \ |
- inline ::v8::base::Flags<Type::flag_type> operator&( \ |
- Type::flag_type lhs, const ::v8::base::Flags<Type::flag_type>& rhs) { \ |
+ inline Type operator&(Type::flag_type lhs, \ |
+ const Type& rhs)ALLOW_UNUSED WARN_UNUSED_RESULT; \ |
+ inline Type operator&(Type::flag_type lhs, const Type& rhs) { \ |
return rhs & lhs; \ |
} \ |
inline void operator&(Type::flag_type lhs, Type::mask_type rhs)ALLOW_UNUSED; \ |
inline void operator&(Type::flag_type lhs, Type::mask_type rhs) {} \ |
- inline ::v8::base::Flags<Type::flag_type> operator|(Type::flag_type lhs, \ |
- Type::flag_type rhs) \ |
+ inline Type operator|(Type::flag_type lhs, Type::flag_type rhs) \ |
ALLOW_UNUSED WARN_UNUSED_RESULT; \ |
- inline ::v8::base::Flags<Type::flag_type> operator|(Type::flag_type lhs, \ |
- Type::flag_type rhs) { \ |
- return ::v8::base::Flags<Type::flag_type>(lhs) | rhs; \ |
+ inline Type operator|(Type::flag_type lhs, Type::flag_type rhs) { \ |
+ return Type(lhs) | rhs; \ |
} \ |
- inline ::v8::base::Flags<Type::flag_type> operator|( \ |
- Type::flag_type lhs, const ::v8::base::Flags<Type::flag_type>& rhs) \ |
+ inline Type operator|(Type::flag_type lhs, const Type& rhs) \ |
ALLOW_UNUSED WARN_UNUSED_RESULT; \ |
- inline ::v8::base::Flags<Type::flag_type> operator|( \ |
- Type::flag_type lhs, const ::v8::base::Flags<Type::flag_type>& rhs) { \ |
+ inline Type operator|(Type::flag_type lhs, const Type& rhs) { \ |
return rhs | lhs; \ |
} \ |
inline void operator|(Type::flag_type lhs, Type::mask_type rhs) \ |
ALLOW_UNUSED; \ |
inline void operator|(Type::flag_type lhs, Type::mask_type rhs) {} \ |
- inline ::v8::base::Flags<Type::flag_type> operator^(Type::flag_type lhs, \ |
- Type::flag_type rhs) \ |
+ inline Type operator^(Type::flag_type lhs, Type::flag_type rhs) \ |
ALLOW_UNUSED WARN_UNUSED_RESULT; \ |
- inline ::v8::base::Flags<Type::flag_type> operator^(Type::flag_type lhs, \ |
- Type::flag_type rhs) { \ |
- return ::v8::base::Flags<Type::flag_type>(lhs) ^ rhs; \ |
- } inline ::v8::base::Flags<Type::flag_type> \ |
- operator^(Type::flag_type lhs, \ |
- const ::v8::base::Flags<Type::flag_type>& rhs) \ |
+ inline Type operator^(Type::flag_type lhs, Type::flag_type rhs) { \ |
+ return Type(lhs) ^ rhs; \ |
+ } inline Type operator^(Type::flag_type lhs, const Type& rhs) \ |
ALLOW_UNUSED WARN_UNUSED_RESULT; \ |
- inline ::v8::base::Flags<Type::flag_type> operator^( \ |
- Type::flag_type lhs, const ::v8::base::Flags<Type::flag_type>& rhs) { \ |
+ inline Type operator^(Type::flag_type lhs, const Type& rhs) { \ |
return rhs ^ lhs; \ |
} inline void operator^(Type::flag_type lhs, Type::mask_type rhs) \ |
ALLOW_UNUSED; \ |