diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-12-19 14:43:22 +0100 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-02-07 21:39:22 +0100 |
| commit | adf8ba14c3e54abc971443ca0d6e121a9d4671cb (patch) | |
| tree | b33767927e47309ee8e3749ab97d7ba3dc942366 | |
| parent | 8d92009942ba69b816f2e5125ca0c0d1b38f97b0 (diff) | |
| download | qtscript-adf8ba14c3e54abc971443ca0d6e121a9d4671cb.tar.gz | |
Use QAtomicInt::load/storeRelaxed intead of load/store()
...which were removed in Qt6
Change-Id: I19305e0276d814811cf76ed39769bf05172d0801
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rw-r--r-- | src/script/api/qscriptstring.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp index 0107c52..1623d92 100644 --- a/src/script/api/qscriptstring.cpp +++ b/src/script/api/qscriptstring.cpp @@ -87,9 +87,9 @@ QScriptString::QScriptString(const QScriptString &other) : d_ptr(other.d_ptr) { if (d_func() && (d_func()->type == QScriptStringPrivate::StackAllocated)) { - Q_ASSERT(d_func()->ref.load() != 1); + Q_ASSERT(d_func()->ref.loadRelaxed() != 1); d_ptr.detach(); - d_func()->ref.store(1); + d_func()->ref.storeRelaxed(1); d_func()->type = QScriptStringPrivate::HeapAllocated; d_func()->engine->registerScriptString(d_func()); } @@ -104,11 +104,11 @@ QScriptString::~QScriptString() if (d) { switch (d->type) { case QScriptStringPrivate::StackAllocated: - Q_ASSERT(d->ref.load() == 1); + Q_ASSERT(d->ref.loadRelaxed() == 1); d->ref.ref(); // avoid deletion break; case QScriptStringPrivate::HeapAllocated: - if (d->engine && (d->ref.load() == 1)) { + if (d->engine && (d->ref.loadRelaxed() == 1)) { // Make sure the identifier is removed from the correct engine. QScript::APIShim shim(d->engine); d->identifier = JSC::Identifier(); @@ -124,15 +124,15 @@ QScriptString::~QScriptString() */ QScriptString &QScriptString::operator=(const QScriptString &other) { - if (d_func() && d_func()->engine && (d_func()->ref.load() == 1) && (d_func()->type == QScriptStringPrivate::HeapAllocated)) { + if (d_func() && d_func()->engine && (d_func()->ref.loadRelaxed() == 1) && (d_func()->type == QScriptStringPrivate::HeapAllocated)) { // current d_ptr will be deleted at the assignment below, so unregister it first d_func()->engine->unregisterScriptString(d_func()); } d_ptr = other.d_ptr; if (d_func() && (d_func()->type == QScriptStringPrivate::StackAllocated)) { - Q_ASSERT(d_func()->ref.load() != 1); + Q_ASSERT(d_func()->ref.loadRelaxed() != 1); d_ptr.detach(); - d_func()->ref.store(1); + d_func()->ref.storeRelaxed(1); d_func()->type = QScriptStringPrivate::HeapAllocated; d_func()->engine->registerScriptString(d_func()); } |