diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-08-23 18:34:02 +0200 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-10-31 09:54:15 +0100 |
| commit | 6700fb0bf0bc1be7346c8184b7c112c574ba6515 (patch) | |
| tree | 205f33701ea19b0f56c38cf2f77ec861618b6d9b /src/corelib/global/qflags.h | |
| parent | 053e8c41d7f87a07cb1a74cd95bd030ac138dc4e (diff) | |
Use Q_DECL_RELAXED_CONSTEXPR in QFlags
Change-Id: I91073f4bb71e554402fc13cbd0e9ba5b5b95bce0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qflags.h')
| -rw-r--r-- | src/corelib/global/qflags.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index 275ab12800..cfe75c4eea 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -117,13 +117,13 @@ public: : i(initializer_list_helper(flags.begin(), flags.end())) {} #endif - inline QFlags &operator&=(int mask) { i &= mask; return *this; } - inline QFlags &operator&=(uint mask) { i &= mask; return *this; } - inline QFlags &operator&=(Enum mask) { i &= Int(mask); return *this; } - inline QFlags &operator|=(QFlags f) { i |= f.i; return *this; } - inline QFlags &operator|=(Enum f) { i |= Int(f); return *this; } - inline QFlags &operator^=(QFlags f) { i ^= f.i; return *this; } - inline QFlags &operator^=(Enum f) { i ^= Int(f); return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(int mask) { i &= mask; return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(uint mask) { i &= mask; return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(Enum mask) { i &= Int(mask); return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator|=(QFlags f) { i |= f.i; return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator|=(Enum f) { i |= Int(f); return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator^=(QFlags f) { i ^= f.i; return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator^=(Enum f) { i ^= Int(f); return *this; } Q_DECL_CONSTEXPR inline operator Int() const { return i; } |