From 4f2471b8ccd936463a63fc1f6063d06e91635505 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 2 Dec 2013 18:34:58 -0800 Subject: Fix silly typo in a macro for QAtomicInt's constructor The T was missing in QT_BASIC_ATOMIC_HAS_CONSTRUCTORS. This makes QAtomicInt's constructor become constexpr. Change-Id: Ibe58ff36517c5d05ce8af9c0f28169fa63521632 Reviewed-by: Marc Mutz Reviewed-by: Olivier Goffart --- src/corelib/thread/qatomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index 1ccaecc135..78eff2a710 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -59,7 +59,7 @@ class QAtomicInt : public QBasicAtomicInt { public: // Non-atomic API -#ifdef Q_BASIC_ATOMIC_HAS_CONSTRUCTORS +#ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS constexpr QAtomicInt(int value = 0) Q_DECL_NOTHROW : QBasicAtomicInt(value) {} #else inline QAtomicInt(int value = 0) Q_DECL_NOTHROW -- cgit v1.2.3