From 51f6651d4c0097f8735ce2d2bfbf494d92c66274 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 29 May 2014 12:24:35 +0200 Subject: Make QWeakPointer's ctor constexpr Change-Id: Ia23406ee80e83071a129606b76f78e2b6d0cf32e Reviewed-by: Thiago Macieira --- src/corelib/tools/qsharedpointer_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/tools') diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index f3df32469f..7dafa4981c 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -582,7 +582,7 @@ public: inline bool operator !() const { return isNull(); } inline T *data() const { return d == 0 || d->strongref.load() == 0 ? 0 : value; } - inline QWeakPointer() : d(0), value(0) { } + Q_DECL_CONSTEXPR inline QWeakPointer() : d(0), value(0) { } inline ~QWeakPointer() { if (d && !d->weakref.deref()) delete d; } #ifndef QT_NO_QOBJECT -- cgit v1.2.3