From f4227a7b86f073724bb456e075bafb9031844ff1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 28 Mar 2012 16:41:07 -0300 Subject: [PATCH] Make the fallback Q_ASSUME and Q_UNREACHABLE be qt_noop That way, we can properly add ; after them, and I can use Q_ASSUME in Q_ASSERT's else condition. Change-Id: Iad35819fbb06714116b7dd0f952e1c2c89044c72 Reviewed-by: Olivier Goffart --- src/corelib/global/qcompilerdetection.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index c48f3da84dc..67baf42f8bb 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -652,10 +652,10 @@ # define Q_UNLIKELY(x) (x) #endif #ifndef Q_ASSUME -# define Q_ASSUME(expr) +# define Q_ASSUME(expr) qt_noop() #endif #ifndef Q_UNREACHABLE -# define Q_UNREACHABLE() +# define Q_UNREACHABLE() qt_noop() #endif #ifndef Q_ALLOC_SIZE # define Q_ALLOC_SIZE(x)