AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the option of using decltype() in Q_FOREACH

Browse Source 
This should allow more compilers to use the shorter & simpler version of
the macro.

Change-Id: Ibd2bf20f479b707a7806d0265a5580ebfc2e7733
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Thiago Macieira 2014-02-11 14:58:46 -08:00 committed by The Qt Project
parent c35a3f5190
commit 0ed63f0a2b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/global/qglobal.h
View File

@ -858,8 +858,8 @@ Q_CORE_EXPORT void qFreeAligned(void *ptr);
# endif
#endif
#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT))
/* make use of typeof-extension */
#if defined(Q_COMPILER_DECLTYPE) || (defined(Q_CC_GNU) && !defined(Q_CC_RVCT))
/* make use of decltype or GCC's __typeof__ extension */
template <typename T>
class QForeachContainer {
public:
@ -869,6 +869,11 @@ public:
int control;
};
# ifdef Q_COMPILER_DECLTYPE
# define QT_FOREACH_DECLTYPE(x) typename QtPrivate::remove_reference<decltype(x)>::type
# else
# define QT_FOREACH_DECLTYPE(x) __typeof__((x))
# endif
// Explanation of the control word:
// - it's initialized to 1
@ -880,7 +885,7 @@ public:
// - if there was a break inside the inner loop, it will exit with control still
// set to 1; in that case, the outer loop will invert it to 0 and will exit too
# define Q_FOREACH(variable, container) \
for (QForeachContainer<__typeof__((container))> _container_((container)); \
for (QForeachContainer<QT_FOREACH_DECLTYPE(container)> _container_((container)); \
_container_.control && _container_.i != _container_.e; \
++_container_.i, _container_.control ^= 1) \
for (variable = *_container_.i; _container_.control; _container_.control = 0)