commit 6c9f17dc5fe58e23db0ba591302168766b38ab2a
author Jim Flynn <jim.flynn@arm.com> Thu Mar 10 23:13:01 2022 +0000
committer Jim Flynn <jim.flynn@arm.com> Sat Mar 12 15:14:48 2022 +0000
tree 50b302f1bdfcce997a2b8330a8142d6858c672d5
parent 6730fe9cbc195f054d697b25daba8516d70658e0

IVGCVSW-6843 replace armnn::Logging with arm::pipe::Logging in profiling code

Change-Id: I9c3af46ca02c5685e06657b8af0e4658d71891d4
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

src/profiling/test/ProfilingTests.hpp

diff --git a/src/profiling/test/ProfilingTests.hpp b/src/profiling/test/ProfilingTests.hpp
index 70bf613..e55117b 100644
--- a/src/profiling/test/ProfilingTests.hpp
+++ b/src/profiling/test/ProfilingTests.hpp
@@ -7,14 +7,13 @@
 
 #include "ProfilingMocks.hpp"
 
-#include <armnn/Logging.hpp>
 #include <armnn/utility/PolymorphicDowncast.hpp>
 
 #include <IProfilingConnection.hpp>
 #include <ProfilingService.hpp>
 
 #include <common/include/CommandHandlerFunctor.hpp>
-
+#include <common/include/Logging.hpp>
 
 #include <doctest/doctest.h>
 
@@ -27,46 +26,6 @@
 namespace pipe
 {
 
-struct LogLevelSwapper
-{
-public:
-    LogLevelSwapper(armnn::LogSeverity severity)
-    {
-        // Set the new log level
-        armnn::ConfigureLogging(true, true, severity);
-    }
-    ~LogLevelSwapper()
-    {
-        // The default log level for unit tests is "Fatal"
-        armnn::ConfigureLogging(true, true, armnn::LogSeverity::Fatal);
-    }
-};
-
-struct StreamRedirector
-{
-public:
-    StreamRedirector(std::ostream& stream, std::streambuf* newStreamBuffer)
-        : m_Stream(stream)
-        , m_BackupBuffer(m_Stream.rdbuf(newStreamBuffer))
-    {}
-
-    ~StreamRedirector() { CancelRedirect(); }
-
-    void CancelRedirect()
-    {
-        // Only cancel the redirect once.
-        if (m_BackupBuffer != nullptr )
-        {
-            m_Stream.rdbuf(m_BackupBuffer);
-            m_BackupBuffer = nullptr;
-        }
-    }
-
-private:
-    std::ostream& m_Stream;
-    std::streambuf* m_BackupBuffer;
-};
-
 class TestProfilingConnectionBase : public IProfilingConnection
 {
 public: