From ea241d86f360f934a3c641d1d55276d1964c49c7 Mon Sep 17 00:00:00 2001 From: Jamie Reece Wilson Date: Thu, 28 Sep 2023 15:42:09 +0100 Subject: [PATCH] [*] Resolve ambiguous namespace regression (new conflict between Aurora::IO::Utility and Aurora::Utility) --- Source/IO/AuIOPipeProcessor.hpp | 2 +- Source/IO/AuIOProcessorTimers.hpp | 2 +- Source/IO/Net/AuSocketStats.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/IO/AuIOPipeProcessor.hpp b/Source/IO/AuIOPipeProcessor.hpp index 17e39a82..f7f54db9 100644 --- a/Source/IO/AuIOPipeProcessor.hpp +++ b/Source/IO/AuIOPipeProcessor.hpp @@ -108,7 +108,7 @@ namespace Aurora::IO AuUInt uBytesWrittenLimit_ {}; AuUInt uBytesWrittenTarget_ {}; AuByteBuffer buffer_; - Utility::ThroughputCalculator throughput_; + Aurora::Utility::ThroughputCalculator throughput_; AuUInt bytesProcessedInterframe_ {}; bool bWritingAheadLowLatency {}; bool bWritingAheadIOUOneTerminate {}; diff --git a/Source/IO/AuIOProcessorTimers.hpp b/Source/IO/AuIOProcessorTimers.hpp index c105ac72..07518342 100644 --- a/Source/IO/AuIOProcessorTimers.hpp +++ b/Source/IO/AuIOProcessorTimers.hpp @@ -15,7 +15,7 @@ namespace Aurora::IO { IOProcessor *pParent {}; AuSPtr pLsTicker; - Utility::RateLimiter nbTicker; + Aurora::Utility::RateLimiter nbTicker; bool Init(IOProcessor *parent, AuSPtr lsTicker); diff --git a/Source/IO/Net/AuSocketStats.hpp b/Source/IO/Net/AuSocketStats.hpp index c21f38a4..bcce7f71 100644 --- a/Source/IO/Net/AuSocketStats.hpp +++ b/Source/IO/Net/AuSocketStats.hpp @@ -25,7 +25,7 @@ namespace Aurora::IO::Net AuUInt64 uLastTimeSteadyMS {}; private: - Utility::ThroughputCalculator calculator; + Aurora::Utility::ThroughputCalculator calculator; AuInt64 iFirstTime {}; AuInt64 iLastTime {}; AuUInt64 uTotalTransferred {};