projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d55ba0
)
Make the fallback Q_ASSUME and Q_UNREACHABLE be qt_noop
author
Thiago Macieira
<thiago.macieira@intel.com>
Wed, 28 Mar 2012 19:41:07 +0000
(16:41 -0300)
committer
Qt by Nokia
<qt-info@nokia.com>
Sat, 21 Apr 2012 03:09:24 +0000
(
05:09
+0200)
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>
src/corelib/global/qcompilerdetection.h
patch
|
blob
|
history
diff --git
a/src/corelib/global/qcompilerdetection.h
b/src/corelib/global/qcompilerdetection.h
index
c48f3da
..
67baf42
100644
(file)
--- 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)