1
0
Fork 0
mirror of git://slackware.nl/current.git synced 2025-01-16 15:41:42 +01:00
slackware-current/source/xap/mozilla-thunderbird/gcc13-fix.patch
Patrick J Volkerding b95c756969 Fri Jun 9 01:06:21 UTC 2023
d/mercurial-6.4.4-x86_64-1.txz:  Upgraded.
d/python3-3.9.17-x86_64-1.txz:  Upgraded.
  This update fixes bugs and a security issue:
  urllib.parse.urlsplit() now strips leading C0 control and space characters
  following the specification for URLs defined by WHATWG.
  For more information, see:
    https://www.cve.org/CVERecord?id=CVE-2023-24329
  (* Security fix *)
kde/akonadi-23.04.2-x86_64-1.txz:  Upgraded.
kde/akonadi-calendar-23.04.2-x86_64-1.txz:  Upgraded.
kde/akonadi-calendar-tools-23.04.2-x86_64-1.txz:  Upgraded.
kde/akonadi-contacts-23.04.2-x86_64-1.txz:  Upgraded.
kde/akonadi-import-wizard-23.04.2-x86_64-1.txz:  Upgraded.
kde/akonadi-mime-23.04.2-x86_64-1.txz:  Upgraded.
kde/akonadi-notes-23.04.2-x86_64-1.txz:  Upgraded.
kde/akonadi-search-23.04.2-x86_64-1.txz:  Upgraded.
kde/akonadiconsole-23.04.2-x86_64-1.txz:  Upgraded.
kde/akregator-23.04.2-x86_64-1.txz:  Upgraded.
kde/alligator-23.04.2-x86_64-1.txz:  Upgraded.
kde/analitza-23.04.2-x86_64-1.txz:  Upgraded.
kde/ark-23.04.2-x86_64-1.txz:  Upgraded.
kde/artikulate-23.04.2-x86_64-1.txz:  Upgraded.
kde/audiocd-kio-23.04.2-x86_64-1.txz:  Upgraded.
kde/baloo-widgets-23.04.2-x86_64-1.txz:  Upgraded.
kde/blinken-23.04.2-x86_64-1.txz:  Upgraded.
kde/bomber-23.04.2-x86_64-1.txz:  Upgraded.
kde/bovo-23.04.2-x86_64-1.txz:  Upgraded.
kde/calendarsupport-23.04.2-x86_64-1.txz:  Upgraded.
kde/cantor-23.04.2-x86_64-1.txz:  Upgraded.
kde/cervisia-23.04.2-x86_64-1.txz:  Upgraded.
kde/dolphin-23.04.2-x86_64-1.txz:  Upgraded.
kde/dolphin-plugins-23.04.2-x86_64-1.txz:  Upgraded.
kde/dragon-23.04.2-x86_64-1.txz:  Upgraded.
kde/elisa-23.04.2-x86_64-1.txz:  Upgraded.
kde/eventviews-23.04.2-x86_64-1.txz:  Upgraded.
kde/falkon-23.04.2-x86_64-1.txz:  Upgraded.
kde/ffmpegthumbs-23.04.2-x86_64-1.txz:  Upgraded.
kde/filelight-23.04.2-x86_64-1.txz:  Upgraded.
kde/ghostwriter-23.04.2-x86_64-1.txz:  Upgraded.
kde/granatier-23.04.2-x86_64-1.txz:  Upgraded.
kde/grantlee-editor-23.04.2-x86_64-1.txz:  Upgraded.
kde/grantleetheme-23.04.2-x86_64-1.txz:  Upgraded.
kde/gwenview-23.04.2-x86_64-1.txz:  Upgraded.
kde/incidenceeditor-23.04.2-x86_64-1.txz:  Upgraded.
kde/itinerary-23.04.2-x86_64-1.txz:  Upgraded.
kde/juk-23.04.2-x86_64-1.txz:  Upgraded.
kde/k3b-23.04.2-x86_64-1.txz:  Upgraded.
kde/kaddressbook-23.04.2-x86_64-1.txz:  Upgraded.
kde/kalarm-23.04.2-x86_64-1.txz:  Upgraded.
kde/kalendar-23.04.2-x86_64-1.txz:  Upgraded.
kde/kalgebra-23.04.2-x86_64-1.txz:  Upgraded.
kde/kalzium-23.04.2-x86_64-1.txz:  Upgraded.
kde/kamera-23.04.2-x86_64-1.txz:  Upgraded.
kde/kamoso-23.04.2-x86_64-1.txz:  Upgraded.
kde/kanagram-23.04.2-x86_64-1.txz:  Upgraded.
kde/kapman-23.04.2-x86_64-1.txz:  Upgraded.
kde/kapptemplate-23.04.2-x86_64-1.txz:  Upgraded.
kde/kate-23.04.2-x86_64-1.txz:  Upgraded.
kde/katomic-23.04.2-x86_64-1.txz:  Upgraded.
kde/kbackup-23.04.2-x86_64-1.txz:  Upgraded.
kde/kblackbox-23.04.2-x86_64-1.txz:  Upgraded.
kde/kblocks-23.04.2-x86_64-1.txz:  Upgraded.
kde/kbounce-23.04.2-x86_64-1.txz:  Upgraded.
kde/kbreakout-23.04.2-x86_64-1.txz:  Upgraded.
kde/kbruch-23.04.2-x86_64-1.txz:  Upgraded.
kde/kcachegrind-23.04.2-x86_64-1.txz:  Upgraded.
kde/kcalc-23.04.2-x86_64-1.txz:  Upgraded.
kde/kcalutils-23.04.2-x86_64-1.txz:  Upgraded.
kde/kcharselect-23.04.2-x86_64-1.txz:  Upgraded.
kde/kcolorchooser-23.04.2-x86_64-1.txz:  Upgraded.
kde/kcron-23.04.2-x86_64-1.txz:  Upgraded.
kde/kde-dev-scripts-23.04.2-x86_64-1.txz:  Upgraded.
kde/kde-dev-utils-23.04.2-x86_64-1.txz:  Upgraded.
kde/kde-inotify-survey-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdebugsettings-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdeconnect-kde-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdeedu-data-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdegraphics-mobipocket-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdegraphics-thumbnailers-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdenetwork-filesharing-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdenlive-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdepim-addons-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdepim-runtime-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdesdk-kio-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdesdk-thumbnailers-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdev-php-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdev-python-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdevelop-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdf-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdialog-23.04.2-x86_64-1.txz:  Upgraded.
kde/kdiamond-23.04.2-x86_64-1.txz:  Upgraded.
kde/keditbookmarks-23.04.2-x86_64-1.txz:  Upgraded.
kde/keysmith-23.04.2-x86_64-1.txz:  Upgraded.
kde/kfind-23.04.2-x86_64-1.txz:  Upgraded.
kde/kfloppy-23.04.2-x86_64-1.txz:  Upgraded.
kde/kfourinline-23.04.2-x86_64-1.txz:  Upgraded.
kde/kgeography-23.04.2-x86_64-1.txz:  Upgraded.
kde/kget-23.04.2-x86_64-1.txz:  Upgraded.
kde/kgoldrunner-23.04.2-x86_64-1.txz:  Upgraded.
kde/kgpg-23.04.2-x86_64-1.txz:  Upgraded.
kde/khangman-23.04.2-x86_64-1.txz:  Upgraded.
kde/khelpcenter-23.04.2-x86_64-1.txz:  Upgraded.
kde/kidentitymanagement-23.04.2-x86_64-1.txz:  Upgraded.
kde/kig-23.04.2-x86_64-1.txz:  Upgraded.
kde/kigo-23.04.2-x86_64-1.txz:  Upgraded.
kde/killbots-23.04.2-x86_64-1.txz:  Upgraded.
kde/kimagemapeditor-23.04.2-x86_64-1.txz:  Upgraded.
kde/kimap-23.04.2-x86_64-1.txz:  Upgraded.
kde/kio-admin-23.04.2-x86_64-1.txz:  Upgraded.
kde/kio-extras-23.04.2-x86_64-1.txz:  Upgraded.
kde/kio-gdrive-23.04.2-x86_64-1.txz:  Upgraded.
kde/kio-zeroconf-23.04.2-x86_64-1.txz:  Upgraded.
kde/kipi-plugins-23.04.2-x86_64-1.txz:  Upgraded.
kde/kirigami-gallery-23.04.2-x86_64-1.txz:  Upgraded.
kde/kiriki-23.04.2-x86_64-1.txz:  Upgraded.
kde/kiten-23.04.2-x86_64-1.txz:  Upgraded.
kde/kitinerary-23.04.2-x86_64-1.txz:  Upgraded.
kde/kjumpingcube-23.04.2-x86_64-1.txz:  Upgraded.
kde/kldap-23.04.2-x86_64-1.txz:  Upgraded.
kde/kleopatra-23.04.2-x86_64-1.txz:  Upgraded.
kde/klickety-23.04.2-x86_64-1.txz:  Upgraded.
kde/klines-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmag-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmahjongg-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmail-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmail-account-wizard-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmailtransport-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmbox-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmime-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmines-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmix-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmousetool-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmouth-23.04.2-x86_64-1.txz:  Upgraded.
kde/kmplot-23.04.2-x86_64-1.txz:  Upgraded.
kde/knavalbattle-23.04.2-x86_64-1.txz:  Upgraded.
kde/knetwalk-23.04.2-x86_64-1.txz:  Upgraded.
kde/knights-23.04.2-x86_64-1.txz:  Upgraded.
kde/knotes-23.04.2-x86_64-1.txz:  Upgraded.
kde/kolf-23.04.2-x86_64-1.txz:  Upgraded.
kde/kollision-23.04.2-x86_64-1.txz:  Upgraded.
kde/kolourpaint-23.04.2-x86_64-1.txz:  Upgraded.
kde/kompare-23.04.2-x86_64-1.txz:  Upgraded.
kde/konqueror-23.04.2-x86_64-1.txz:  Upgraded.
kde/konquest-23.04.2-x86_64-1.txz:  Upgraded.
kde/konsole-23.04.2-x86_64-1.txz:  Upgraded.
kde/kontact-23.04.2-x86_64-1.txz:  Upgraded.
kde/kontactinterface-23.04.2-x86_64-1.txz:  Upgraded.
kde/kontrast-23.04.2-x86_64-1.txz:  Upgraded.
kde/konversation-23.04.2-x86_64-1.txz:  Upgraded.
kde/kopeninghours-23.04.2-x86_64-1.txz:  Upgraded.
kde/kopete-23.04.2-x86_64-1.txz:  Upgraded.
kde/korganizer-23.04.2-x86_64-1.txz:  Upgraded.
kde/kosmindoormap-23.04.2-x86_64-1.txz:  Upgraded.
kde/kpat-23.04.2-x86_64-1.txz:  Upgraded.
kde/kpimtextedit-23.04.2-x86_64-1.txz:  Upgraded.
kde/kpkpass-23.04.2-x86_64-1.txz:  Upgraded.
kde/kpmcore-23.04.2-x86_64-1.txz:  Upgraded.
kde/kpublictransport-23.04.2-x86_64-1.txz:  Upgraded.
kde/kqtquickcharts-23.04.2-x86_64-1.txz:  Upgraded.
kde/krdc-23.04.2-x86_64-1.txz:  Upgraded.
kde/kreversi-23.04.2-x86_64-1.txz:  Upgraded.
kde/krfb-23.04.2-x86_64-1.txz:  Upgraded.
kde/kross-interpreters-23.04.2-x86_64-1.txz:  Upgraded.
kde/kruler-23.04.2-x86_64-1.txz:  Upgraded.
kde/ksanecore-23.04.2-x86_64-1.txz:  Upgraded.
kde/kshisen-23.04.2-x86_64-1.txz:  Upgraded.
kde/ksirk-23.04.2-x86_64-1.txz:  Upgraded.
kde/ksmtp-23.04.2-x86_64-1.txz:  Upgraded.
kde/ksnakeduel-23.04.2-x86_64-1.txz:  Upgraded.
kde/kspaceduel-23.04.2-x86_64-1.txz:  Upgraded.
kde/ksquares-23.04.2-x86_64-1.txz:  Upgraded.
kde/ksudoku-23.04.2-x86_64-1.txz:  Upgraded.
kde/ksystemlog-23.04.2-x86_64-1.txz:  Upgraded.
kde/kteatime-23.04.2-x86_64-1.txz:  Upgraded.
kde/ktimer-23.04.2-x86_64-1.txz:  Upgraded.
kde/ktnef-23.04.2-x86_64-1.txz:  Upgraded.
kde/ktorrent-23.04.2-x86_64-1.txz:  Upgraded.
kde/ktouch-23.04.2-x86_64-1.txz:  Upgraded.
kde/kturtle-23.04.2-x86_64-1.txz:  Upgraded.
kde/kubrick-23.04.2-x86_64-1.txz:  Upgraded.
kde/kwalletmanager-23.04.2-x86_64-1.txz:  Upgraded.
kde/kwave-23.04.2-x86_64-1.txz:  Upgraded.
kde/kwordquiz-23.04.2-x86_64-1.txz:  Upgraded.
kde/libgravatar-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkcddb-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkcompactdisc-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkdcraw-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkdegames-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkdepim-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkeduvocdocument-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkexiv2-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkgapi-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkipi-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkleo-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkmahjongg-23.04.2-x86_64-1.txz:  Upgraded.
kde/libkomparediff2-23.04.2-x86_64-1.txz:  Upgraded.
kde/libksane-23.04.2-x86_64-1.txz:  Upgraded.
kde/libksieve-23.04.2-x86_64-1.txz:  Upgraded.
kde/libktorrent-23.04.2-x86_64-1.txz:  Upgraded.
kde/lokalize-23.04.2-x86_64-1.txz:  Upgraded.
kde/lskat-23.04.2-x86_64-1.txz:  Upgraded.
kde/mailcommon-23.04.2-x86_64-1.txz:  Upgraded.
kde/mailimporter-23.04.2-x86_64-1.txz:  Upgraded.
kde/marble-23.04.2-x86_64-1.txz:  Upgraded.
kde/markdownpart-23.04.2-x86_64-1.txz:  Upgraded.
kde/mbox-importer-23.04.2-x86_64-1.txz:  Upgraded.
kde/messagelib-23.04.2-x86_64-1.txz:  Upgraded.
kde/minuet-23.04.2-x86_64-1.txz:  Upgraded.
kde/okular-23.04.2-x86_64-1.txz:  Upgraded.
kde/palapeli-23.04.2-x86_64-1.txz:  Upgraded.
kde/parley-23.04.2-x86_64-1.txz:  Upgraded.
kde/partitionmanager-23.04.2-x86_64-1.txz:  Upgraded.
kde/picmi-23.04.2-x86_64-1.txz:  Upgraded.
kde/pim-data-exporter-23.04.2-x86_64-1.txz:  Upgraded.
kde/pim-sieve-editor-23.04.2-x86_64-1.txz:  Upgraded.
kde/pimcommon-23.04.2-x86_64-1.txz:  Upgraded.
kde/poxml-23.04.2-x86_64-1.txz:  Upgraded.
kde/print-manager-23.04.2-x86_64-1.txz:  Upgraded.
kde/rocs-23.04.2-x86_64-1.txz:  Upgraded.
kde/skanlite-23.04.2-x86_64-1.txz:  Upgraded.
kde/skanpage-23.04.2-x86_64-1.txz:  Upgraded.
kde/spectacle-23.04.2-x86_64-1.txz:  Upgraded.
kde/step-23.04.2-x86_64-1.txz:  Upgraded.
kde/svgpart-23.04.2-x86_64-1.txz:  Upgraded.
kde/sweeper-23.04.2-x86_64-1.txz:  Upgraded.
kde/tokodon-23.04.2-x86_64-1.txz:  Upgraded.
kde/umbrello-23.04.2-x86_64-1.txz:  Upgraded.
kde/yakuake-23.04.2-x86_64-1.txz:  Upgraded.
kde/zanshin-23.04.2-x86_64-1.txz:  Upgraded.
l/liburing-2.4-x86_64-1.txz:  Upgraded.
l/nodejs-20.3.0-x86_64-1.txz:  Upgraded.
n/php-8.2.7-x86_64-1.txz:  Upgraded.
  This update fixes bugs and security issues.
  For more information, see:
    https://www.php.net/ChangeLog-8.php#8.2.7
  (* Security fix *)
x/mesa-23.1.2-x86_64-1.txz:  Upgraded.
xap/gnuplot-5.4.8-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-102.12.0-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/102.12.0/releasenotes/
  (* Security fix *)
2023-06-09 04:46:43 +02:00

176 lines
7.9 KiB
Diff

diff --git a/dom/media/webrtc/sdp/RsdparsaSdpGlue.cpp b/dom/media/webrtc/sdp/RsdparsaSdpGlue.cpp
index 8c8a0369c3..01a1a1d817 100644
--- a/dom/media/webrtc/sdp/RsdparsaSdpGlue.cpp
+++ b/dom/media/webrtc/sdp/RsdparsaSdpGlue.cpp
@@ -4,6 +4,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include <string>
+#include <cstdint>
#include "sdp/RsdparsaSdpInc.h"
#include "sdp/RsdparsaSdpGlue.h"
diff --git a/gfx/2d/Rect.h b/gfx/2d/Rect.h
index 4875ad6714..f52437bbdc 100644
--- a/gfx/2d/Rect.h
+++ b/gfx/2d/Rect.h
@@ -15,6 +15,7 @@
#include "mozilla/Maybe.h"
#include <cmath>
+#include <cstdint>
namespace mozilla {
diff --git a/toolkit/components/telemetry/pingsender/pingsender.cpp b/toolkit/components/telemetry/pingsender/pingsender.cpp
index 01fdb63c29..a61b9d3693 100644
--- a/toolkit/components/telemetry/pingsender/pingsender.cpp
+++ b/toolkit/components/telemetry/pingsender/pingsender.cpp
@@ -4,6 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include <cstdlib>
+#include <cstdint>
#include <cstring>
#include <ctime>
#include <fstream>
diff --git a/tools/profiler/core/platform.cpp b/tools/profiler/core/platform.cpp
index bd20110f12..08e38d6938 100644
--- a/tools/profiler/core/platform.cpp
+++ b/tools/profiler/core/platform.cpp
@@ -1106,7 +1106,7 @@ class ActivePS {
continue;
}
ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock lockedThreadData =
- offThreadRef.LockedRWFromAnyThread();
+ offThreadRef.GetLockedRWFromAnyThread();
MOZ_RELEASE_ASSERT(array.append(ProfiledThreadListElement{
profiledThreadData->Info().RegisterTime(),
lockedThreadData->GetJSContext(), profiledThreadData}));
@@ -4050,7 +4050,7 @@ void SamplerThread::Run() {
if (threadStackSampling) {
ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock
- lockedThreadData = offThreadRef.LockedRWFromAnyThread();
+ lockedThreadData = offThreadRef.GetLockedRWFromAnyThread();
// Suspend the thread and collect its stack data in the local
// buffer.
mSampler.SuspendAndSampleAndResumeThread(
@@ -4764,7 +4764,7 @@ static ProfilingStack* locked_register_thread(
aLock, aOffThreadRef.UnlockedConstReaderCRef().Info());
if (threadProfilingFeatures != ThreadProfilingFeatures::NotProfiled) {
ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock
- lockedRWFromAnyThread = aOffThreadRef.LockedRWFromAnyThread();
+ lockedRWFromAnyThread = aOffThreadRef.GetLockedRWFromAnyThread();
ProfiledThreadData* profiledThreadData = ActivePS::AddLiveProfiledThread(
aLock, MakeUnique<ProfiledThreadData>(
@@ -5629,7 +5629,7 @@ static void locked_profiler_start(PSLockRef aLock, PowerOfTwo32 aCapacity,
ActivePS::ProfilingFeaturesForThread(aLock, info);
if (threadProfilingFeatures != ThreadProfilingFeatures::NotProfiled) {
ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock lockedThreadData =
- offThreadRef.LockedRWFromAnyThread();
+ offThreadRef.GetLockedRWFromAnyThread();
ProfiledThreadData* profiledThreadData = ActivePS::AddLiveProfiledThread(
aLock, MakeUnique<ProfiledThreadData>(info));
lockedThreadData->SetProfilingFeaturesAndData(threadProfilingFeatures,
@@ -5853,7 +5853,7 @@ void profiler_ensure_started(PowerOfTwo32 aCapacity, double aInterval,
}
ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock lockedThreadData =
- offThreadRef.LockedRWFromAnyThread();
+ offThreadRef.GetLockedRWFromAnyThread();
lockedThreadData->ClearProfilingFeaturesAndData(aLock);
@@ -6196,7 +6196,7 @@ static void locked_unregister_thread(
// thread that is in the process of disappearing.
ThreadRegistration::OnThreadRef::RWOnThreadWithLock lockedThreadData =
- aOnThreadRef.LockedRWOnThread();
+ aOnThreadRef.GetLockedRWOnThread();
ProfiledThreadData* profiledThreadData =
lockedThreadData->GetProfiledThreadData(lock);
@@ -6717,7 +6717,7 @@ void profiler_clear_js_context() {
// The profiler mutex must be locked before the ThreadRegistration's.
PSAutoLock lock;
ThreadRegistration::OnThreadRef::RWOnThreadWithLock lockedThreadData =
- aOnThreadRef.LockedRWOnThread();
+ aOnThreadRef.GetLockedRWOnThread();
if (ProfiledThreadData* profiledThreadData =
lockedThreadData->GetProfiledThreadData(lock);
diff --git a/tools/profiler/public/ProfilerThreadRegistration.h b/tools/profiler/public/ProfilerThreadRegistration.h
index fafe06e446..3fb931987d 100644
--- a/tools/profiler/public/ProfilerThreadRegistration.h
+++ b/tools/profiler/public/ProfilerThreadRegistration.h
@@ -214,14 +214,14 @@ class ThreadRegistration {
DataLock mDataLock;
};
- [[nodiscard]] RWOnThreadWithLock LockedRWOnThread() {
+ [[nodiscard]] RWOnThreadWithLock GetLockedRWOnThread() {
return RWOnThreadWithLock{mThreadRegistration->mData,
mThreadRegistration->mDataMutex};
}
template <typename F>
auto WithLockedRWOnThread(F&& aF) {
- RWOnThreadWithLock lockedData = LockedRWOnThread();
+ RWOnThreadWithLock lockedData = GetLockedRWOnThread();
return std::forward<F>(aF)(lockedData.DataRef());
}
diff --git a/tools/profiler/public/ProfilerThreadRegistry.h b/tools/profiler/public/ProfilerThreadRegistry.h
index 76e0c0a78a..4d0fd3ef68 100644
--- a/tools/profiler/public/ProfilerThreadRegistry.h
+++ b/tools/profiler/public/ProfilerThreadRegistry.h
@@ -177,14 +177,14 @@ class ThreadRegistry {
ThreadRegistration::DataLock mDataLock;
};
- [[nodiscard]] RWFromAnyThreadWithLock LockedRWFromAnyThread() {
+ [[nodiscard]] RWFromAnyThreadWithLock GetLockedRWFromAnyThread() {
return RWFromAnyThreadWithLock{mThreadRegistration->mData,
mThreadRegistration->mDataMutex};
}
template <typename F>
auto WithLockedRWFromAnyThread(F&& aF) {
- RWFromAnyThreadWithLock lockedData = LockedRWFromAnyThread();
+ RWFromAnyThreadWithLock lockedData = GetLockedRWFromAnyThread();
return std::forward<F>(aF)(lockedData.DataRef());
}
diff --git a/tools/profiler/tests/gtest/GeckoProfiler.cpp b/tools/profiler/tests/gtest/GeckoProfiler.cpp
index fd0d4d2acc..c9882cb5d3 100644
--- a/tools/profiler/tests/gtest/GeckoProfiler.cpp
+++ b/tools/profiler/tests/gtest/GeckoProfiler.cpp
@@ -621,7 +621,7 @@ TEST(GeckoProfiler, ThreadRegistration_DataAccess)
EXPECT_FALSE(TR::IsDataMutexLockedOnCurrentThread());
{
TR::OnThreadRef::RWOnThreadWithLock rwOnThreadWithLock =
- aOnThreadRef.LockedRWOnThread();
+ aOnThreadRef.GetLockedRWOnThread();
EXPECT_TRUE(TR::IsDataMutexLockedOnCurrentThread());
TestConstLockedRWOnThread(rwOnThreadWithLock.DataCRef(),
beforeRegistration, afterRegistration,
@@ -1020,7 +1020,7 @@ TEST(GeckoProfiler, ThreadRegistry_DataAccess)
EXPECT_FALSE(TR::IsDataMutexLockedOnCurrentThread());
{
TRy::OffThreadRef::RWFromAnyThreadWithLock rwFromAnyThreadWithLock =
- aOffThreadRef.LockedRWFromAnyThread();
+ aOffThreadRef.GetLockedRWFromAnyThread();
if (profiler_current_thread_id() == testThreadId) {
EXPECT_TRUE(TR::IsDataMutexLockedOnCurrentThread());
}
@@ -1157,7 +1157,7 @@ TEST(GeckoProfiler, ThreadRegistration_RegistrationEdgeCases)
PR_Sleep(PR_MillisecondsToInterval(1));
}
TRy::OffThreadRef::RWFromAnyThreadWithLock rwFromAnyThreadWithLock =
- aOffThreadRef.LockedRWFromAnyThread();
+ aOffThreadRef.GetLockedRWFromAnyThread();
++otherThreadReads;
if (otherThreadReads % 1000 == 0) {
PR_Sleep(PR_MillisecondsToInterval(1));