1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qthreadstorage.h: fix position of namespace macros

Browse Source 
The file contains two implementations of the class template, one for
QT_CONFIG(thread) and one for without. Both are in the QT_NAMESPACE,
but each provided their own QT_{BEGIN,END}_NAMESPACE macro pair.

This is unneeded and may throw off scripts which use the macros as
insertion positions (like includemocs, which, however, operates on
.cpp files, not headers).

To fix, move the namespace macro pair to be around the #if
QT_CONFIG(thread) block.

Pick-to: 6.8 6.5
Change-Id: I56c1f9a4ef7df0fba54c72d8a213fa92573b826c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 8553ffd8d147ecf6a713d12a360027b477dd59c8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-05-14 06:44:59 +02:00 committed by Qt Cherry-pick Bot
parent 3c0986a34c
commit ee69826054
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/thread/qthreadstorage.h
View File

@ -6,10 +6,9 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#if QT_CONFIG(thread)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#if QT_CONFIG(thread)
class Q_CORE_EXPORT QThreadStorageData class Q_CORE_EXPORT QThreadStorageData
{ {
@ -114,16 +113,12 @@ public:
{ qThreadStorage_setLocalData(d, &t); } { qThreadStorage_setLocalData(d, &t); }
}; };
QT_END_NAMESPACE
#else // !QT_CONFIG(thread) #else // !QT_CONFIG(thread)
#include <QtCore/qscopedpointer.h> #include <QtCore/qscopedpointer.h>
#include <type_traits> #include <type_traits>
QT_BEGIN_NAMESPACE
template <typename T, typename U> template <typename T, typename U>
inline bool qThreadStorage_hasLocalData(const QScopedPointer<T, U> &data) inline bool qThreadStorage_hasLocalData(const QScopedPointer<T, U> &data)
{ {
@ -193,8 +188,8 @@ public:
} }
}; };
QT_END_NAMESPACE
#endif // QT_CONFIG(thread) #endif // QT_CONFIG(thread)
QT_END_NAMESPACE
#endif // QTHREADSTORAGE_H #endif // QTHREADSTORAGE_H