From b52fab0c0c6424832af294dc6f703296ac393598 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Fri, 3 Sep 2021 14:57:08 -0700
Subject: [PATCH] fixes AzFramework

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 .../Entity/EntityDebugDisplayBus.h            |  2 +-
 .../AzFramework/AzFramework/Gem/GemInfo.cpp   |  1 +
 .../UnitTest/TestDebugDisplayRequests.h       |  4 ++++
 .../Tests/OctreePerformanceTests.cpp          | 24 ++++++++++++++++---
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h b/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h
index fddaddf303..0a4e1e01ae 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h
@@ -102,7 +102,7 @@ namespace AzFramework
         virtual void PopMatrix() {}
 
     protected:
-        ~DebugDisplayRequests() = default;
+        virtual ~DebugDisplayRequests() = default;
     };
 
     /// Inherit from DebugDisplayRequestBus::Handler to implement the DebugDisplayRequests interface.
diff --git a/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.cpp b/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.cpp
index 62a6334b5d..a7c6b18061 100644
--- a/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.cpp
@@ -34,6 +34,7 @@ namespace AzFramework
             {
             }
 
+            using AZ::SettingsRegistryInterface::Visitor::Visit;
             void Visit(AZStd::string_view path, AZStd::string_view, AZ::SettingsRegistryInterface::Type,
                 AZStd::string_view value) override
             {
diff --git a/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.h b/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.h
index d4c6992057..72b15c1a69 100644
--- a/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.h
+++ b/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.h
@@ -19,6 +19,8 @@ namespace UnitTest
     {
     public:
         TestDebugDisplayRequests();
+        ~TestDebugDisplayRequests() override = default;
+
         const AZStd::vector<AZ::Vector3>& GetPoints() const;
         void ClearPoints();
         //! Returns the AABB of the points generated from received draw calls.
@@ -27,7 +29,9 @@ namespace UnitTest
         // DebugDisplayRequests ...
         void DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max) override;
         void DrawSolidBox(const AZ::Vector3& min, const AZ::Vector3& max) override;
+        using AzFramework::DebugDisplayRequests::DrawWireQuad;
         void DrawWireQuad(float width, float height) override;
+        using AzFramework::DebugDisplayRequests::DrawQuad;
         void DrawQuad(float width, float height) override;
         void DrawTriangles(const AZStd::vector<AZ::Vector3>& vertices, const AZ::Color& color) override;
         void DrawTrianglesIndexed(const AZStd::vector<AZ::Vector3>& vertices, const AZStd::vector<AZ::u32>& indices, const AZ::Color& color) override;
diff --git a/Code/Framework/AzFramework/Tests/OctreePerformanceTests.cpp b/Code/Framework/AzFramework/Tests/OctreePerformanceTests.cpp
index 79332d638b..64fba61e2c 100644
--- a/Code/Framework/AzFramework/Tests/OctreePerformanceTests.cpp
+++ b/Code/Framework/AzFramework/Tests/OctreePerformanceTests.cpp
@@ -20,8 +20,7 @@ namespace Benchmark
     class BM_Octree
         : public benchmark::Fixture
     {
-    public:
-        void SetUp([[maybe_unused]] const ::benchmark::State& state) override
+        void internalSetUp()
         {
             // Create the SystemAllocator if not available
             if (!AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
@@ -72,7 +71,7 @@ namespace Benchmark
             });
         }
 
-        void TearDown([[maybe_unused]] const ::benchmark::State& state) override
+        void internalTearDown()
         {
             m_octreeSystemComponent->DestroyVisibilityScene(m_visScene);
             delete m_octreeSystemComponent;
@@ -91,6 +90,25 @@ namespace Benchmark
             }
         }
 
+    public:
+        void SetUp(const benchmark::State&) override
+        {
+            internalSetUp();
+        }
+        void SetUp(benchmark::State&) override
+        {
+            internalSetUp();
+        }
+
+        void TearDown(const benchmark::State&) override
+        {
+            internalTearDown();
+        }
+        void TearDown(benchmark::State&) override
+        {
+            internalTearDown();
+        }
+
         void InsertEntries(uint32_t entryCount)
         {
             for (uint32_t i = 0; i < entryCount; ++i)