From: Thiago Macieira Date: Wed, 28 Mar 2012 19:41:07 +0000 (-0300) Subject: Make the fallback Q_ASSUME and Q_UNREACHABLE be qt_noop X-Git-Tag: 071012110112~1494 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4227a7b86f073724bb456e075bafb9031844ff1;p=profile%2Fivi%2Fqtbase.git 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 --- diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index c48f3da..67baf42 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)