From 27508324106da02c7fddb066801f40d1428d1437 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 13 Jul 2012 20:40:09 +0200 Subject: Make the QIncompatibleFlag constexpr. Change-Id: If99b43b45cc667449dbe7c487b56885c6ce9b1c7 Reviewed-by: Laszlo Papp Reviewed-by: Thiago Macieira --- src/corelib/global/qflags.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index d3e812aff1..b578177aaf 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -62,11 +62,11 @@ class QIncompatibleFlag { int i; public: - inline explicit QIncompatibleFlag(int i); + Q_DECL_CONSTEXPR inline explicit QIncompatibleFlag(int i); inline operator int() const { return i; } }; -inline QIncompatibleFlag::QIncompatibleFlag(int ai) : i(ai) {} +Q_DECL_CONSTEXPR inline QIncompatibleFlag::QIncompatibleFlag(int ai) : i(ai) {} #ifndef Q_NO_TYPESAFE_FLAGS @@ -114,7 +114,7 @@ public: typedef QFlags Flags; #define Q_DECLARE_INCOMPATIBLE_FLAGS(Flags) \ -inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) \ +Q_DECL_CONSTEXPR inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) \ { return QIncompatibleFlag(int(f1) | f2); } #define Q_DECLARE_OPERATORS_FOR_FLAGS(Flags) \ -- cgit v1.2.3