diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-28 16:41:07 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-21 05:09:24 +0200 |
| commit | f4227a7b86f073724bb456e075bafb9031844ff1 (patch) | |
| tree | d9f3ca1d79db884301213c3419c34ead01c9be03 /src/corelib/global | |
| parent | 4d55ba046c8485e632fd7d86152c8f505e4145c7 (diff) | |
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 <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index c48f3da84d..67baf42f8b 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) |