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

QSemaphore: drop unneeded unnamed namespace around QtSemaphorePrivate

Browse Source 
Fixes GCC 11 C++17 unity-build (didn't investigate which one is the
problem) error:

    qsemaphore.cpp:275:7: error: ‘QSemaphorePrivate’ has a base ‘{anonymous}::QtSemaphorePrivate::Layout1’ whose type uses the anonymous namespace [-Werror=subobject-linkage]
      275 | class QSemaphorePrivate : public QtSemaphorePrivate::Members
          |       ^~~~~~~~~~~~~~~~~

Amends fbc491230fe62f739925e8113d05f4108e2738ef.

Change-Id: I3b95a35822ec62aabd4c310b02bf58679bb9651f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Marc Mutz 2023-06-12 11:45:37 +02:00
parent 9195438a5f
commit 8efe154aa5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/thread/qsemaphore.cpp
View File

@ -251,7 +251,7 @@ futexSemaphoreTryAcquire(QBasicAtomicInteger<quintptr> &u, int n, T timeout)
return false;
}
namespace { namespace QtSemaphorePrivate {
namespace QtSemaphorePrivate {
using namespace QtPrivate;
struct Layout1
{
@ -270,7 +270,7 @@ struct Layout2
// Choose Layout1 if it is smaller than Layout2. That happens for platforms
// where sizeof(mutex) is 64.
using Members = std::conditional_t<sizeof(Layout1) <= sizeof(Layout2), Layout1, Layout2>;
} } // namespace QtSemaphorePrivate
} // namespace QtSemaphorePrivate
class QSemaphorePrivate : public QtSemaphorePrivate::Members
{