From 4308db0c6dee22a351a65fe78dc453670bb510be Mon Sep 17 00:00:00 2001
From: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
Date: Thu, 23 Sep 2021 11:59:43 -0400
Subject: [PATCH] Debug build clang fixes

Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
---
 .../Code/Tests/ClientHierarchyTests.cpp       |  2 +-
 .../Code/Tests/ServerHierarchyTests.cpp       | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gems/Multiplayer/Code/Tests/ClientHierarchyTests.cpp b/Gems/Multiplayer/Code/Tests/ClientHierarchyTests.cpp
index 38ea451c85..316f85c214 100644
--- a/Gems/Multiplayer/Code/Tests/ClientHierarchyTests.cpp
+++ b/Gems/Multiplayer/Code/Tests/ClientHierarchyTests.cpp
@@ -307,7 +307,7 @@ namespace Multiplayer
     class ClientDeepHierarchyTests : public ClientSimpleHierarchyTests
     {
     public:
-        static const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
+        const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
 
         void SetUp() override
         {
diff --git a/Gems/Multiplayer/Code/Tests/ServerHierarchyTests.cpp b/Gems/Multiplayer/Code/Tests/ServerHierarchyTests.cpp
index 70859909b3..385a4b83ae 100644
--- a/Gems/Multiplayer/Code/Tests/ServerHierarchyTests.cpp
+++ b/Gems/Multiplayer/Code/Tests/ServerHierarchyTests.cpp
@@ -414,12 +414,12 @@ namespace Multiplayer
     class ServerBranchedHierarchyTests : public HierarchyTests
     {
     public:
-        static const NetEntityId RootNetEntityId = NetEntityId{ 1 };
-        static const NetEntityId ChildNetEntityId = NetEntityId{ 2 };
-        static const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
-        static const NetEntityId Child2NetEntityId = NetEntityId{ 4 };
-        static const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 5 };
-        static const NetEntityId Child2OfChild2NetEntityId = NetEntityId{ 6 };
+        const NetEntityId RootNetEntityId = NetEntityId{ 1 };
+        const NetEntityId ChildNetEntityId = NetEntityId{ 2 };
+        const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
+        const NetEntityId Child2NetEntityId = NetEntityId{ 4 };
+        const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 5 };
+        const NetEntityId Child2OfChild2NetEntityId = NetEntityId{ 6 };
 
         void SetUp() override
         {
@@ -610,9 +610,9 @@ namespace Multiplayer
     class ServerHierarchyOfHierarchyTests : public ServerDeepHierarchyTests
     {
     public:
-        static const NetEntityId Root2NetEntityId = NetEntityId{ 4 };
-        static const NetEntityId Child2NetEntityId = NetEntityId{ 5 };
-        static const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 6 };
+        const NetEntityId Root2NetEntityId = NetEntityId{ 4 };
+        const NetEntityId Child2NetEntityId = NetEntityId{ 5 };
+        const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 6 };
 
         void SetUp() override
         {
@@ -1132,9 +1132,9 @@ namespace Multiplayer
     class ServerHierarchyWithThreeRoots : public ServerHierarchyOfHierarchyTests
     {
     public:
-        static const NetEntityId Root3NetEntityId = NetEntityId{ 7 };
-        static const NetEntityId Child3NetEntityId = NetEntityId{ 8 };
-        static const NetEntityId ChildOfChild3NetEntityId = NetEntityId{ 9 };
+        const NetEntityId Root3NetEntityId = NetEntityId{ 7 };
+        const NetEntityId Child3NetEntityId = NetEntityId{ 8 };
+        const NetEntityId ChildOfChild3NetEntityId = NetEntityId{ 9 };
 
         void SetUp() override
         {