From 21c07f56e27b6761d94fbb5105329e2393539f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 7 Nov 2012 11:23:09 +0100 Subject: Fix a warning on compilers not supporting constexpr. Macros should call QSKIP instead of creating a semi-empty function body. Change-Id: I389701f618fe9bf0a40aa26f161620389a80e407 Reviewed-by: Thiago Macieira Reviewed-by: Stephen Kelly Reviewed-by: Mitch Curtis --- tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index c8a1eb1797..266eb48ca7 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -1741,25 +1741,25 @@ struct RegisterMetaTypeStructDefaultTemplateValue void tst_QMetaType::constexprMetaTypeIds() { +#if defined(Q_COMPILER_CONSTEXPR) int id = 0; int metaType; switch(id) { -#if defined(Q_COMPILER_CONSTEXPR) QT_FOR_EACH_STATIC_TYPE(METATYPE_ID_FUNCTION) metaType = MetaTypeIdStructDefaultTemplateValue<>::Value; -#endif default:; } switch (id) { -#if defined(Q_COMPILER_CONSTEXPR) QT_FOR_EACH_STATIC_TYPE(REGISTER_METATYPE_FUNCTION) metaType = RegisterMetaTypeStructDefaultTemplateValue<>::Value; -#endif default:; } Q_UNUSED(metaType); +#else + QSKIP("The test needs a compiler supporting constexpr"); +#endif } // Compile-time test, it should be possible to register function pointer types -- cgit v1.2.3