diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-20 12:47:39 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-20 19:28:38 +0000 |
| commit | 950e9dad0e7f1fafb45b7cbb6aa6673af613cd07 (patch) | |
| tree | 859bf47c8f3d9dec02400022c4a2dbb2ae91427f /src/corelib/thread/qreadwritelock.cpp | |
| parent | dd82f399106a66ffabdc05d55cc72d46f8bca1c7 (diff) | |
QReadWriteLock: Resolve a redefinition issue
This collides with a similarly name struct/object in qmutex.cpp.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I29404f092db523e21f310b4e5b3cd8cc35170e4a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread/qreadwritelock.cpp')
| -rw-r--r-- | src/corelib/thread/qreadwritelock.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp index c31782d6843..274d0ba7f86 100644 --- a/src/corelib/thread/qreadwritelock.cpp +++ b/src/corelib/thread/qreadwritelock.cpp @@ -580,25 +580,24 @@ void QReadWriteLockPrivate::recursiveUnlock() // The freelist management namespace { -struct FreeListConstants : QFreeListDefaultConstants { +struct QReadWriteLockFreeListConstants : QFreeListDefaultConstants +{ enum { BlockCount = 4, MaxIndex=0xffff }; static const int Sizes[BlockCount]; }; -Q_CONSTINIT const int FreeListConstants::Sizes[FreeListConstants::BlockCount] = { - 16, - 128, - 1024, - FreeListConstants::MaxIndex - (16 + 128 + 1024) -}; +Q_CONSTINIT const int + QReadWriteLockFreeListConstants::Sizes[QReadWriteLockFreeListConstants::BlockCount] = { + 16, 128, 1024, QReadWriteLockFreeListConstants::MaxIndex - (16 + 128 + 1024) + }; -typedef QFreeList<QReadWriteLockPrivate, FreeListConstants> FreeList; -Q_GLOBAL_STATIC(FreeList, freelist); +typedef QFreeList<QReadWriteLockPrivate, QReadWriteLockFreeListConstants> QReadWriteLockFreeList; +Q_GLOBAL_STATIC(QReadWriteLockFreeList, qrwl_freelist); } QReadWriteLockPrivate *QReadWriteLockPrivate::allocate() { - int i = freelist->next(); - QReadWriteLockPrivate *d = &(*freelist)[i]; + int i = qrwl_freelist->next(); + QReadWriteLockPrivate *d = &(*qrwl_freelist)[i]; d->id = i; Q_ASSERT(!d->recursive); Q_ASSERT(!d->waitingReaders && !d->waitingWriters && !d->readerCount && !d->writerCount); @@ -609,7 +608,7 @@ void QReadWriteLockPrivate::release() { Q_ASSERT(!recursive); Q_ASSERT(!waitingReaders && !waitingWriters && !readerCount && !writerCount); - freelist->release(id); + qrwl_freelist->release(id); } /*! |