From 4b28152da64f7f23a1bbb810d8cdb7626a5f0b8e Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 28 Jun 2014 17:58:18 -0700 Subject: Make QFreeList constexpr It's still not a literal type because the destructor is not constexpr Change-Id: If89bdfdd3f0ffe9bdd5a7953e872e520e92cfd66 Reviewed-by: Olivier Goffart --- src/corelib/tools/qfreelist_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/tools') diff --git a/src/corelib/tools/qfreelist_p.h b/src/corelib/tools/qfreelist_p.h index ca946cbd8a..d6d3a3ad3d 100644 --- a/src/corelib/tools/qfreelist_p.h +++ b/src/corelib/tools/qfreelist_p.h @@ -191,7 +191,7 @@ class QFreeList Q_DISABLE_COPY(QFreeList) public: - inline QFreeList(); + Q_DECL_CONSTEXPR inline QFreeList(); inline ~QFreeList(); // returns the payload for the given index \a x @@ -207,7 +207,7 @@ public: }; template -inline QFreeList::QFreeList() +Q_DECL_CONSTEXPR inline QFreeList::QFreeList() : _next(ConstantsType::InitialNextValue) { } -- cgit v1.2.3