From 976c6abb9089026ea164c5fd8c5852df2d5bd407 Mon Sep 17 00:00:00 2001
From: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
Date: Mon, 8 Nov 2021 13:34:12 -0800
Subject: [PATCH] Build fix.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
---
 .../AzFramework/Spawnable/Spawnable.cpp       | 26 ++++++++++++-------
 .../AzFramework/Spawnable/Spawnable.h         |  2 ++
 .../Spawnable/SpawnableAssetHandler.cpp       |  2 +-
 .../Spawnable/SpawnableEntitiesManager.cpp    |  2 --
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.cpp
index 27e8a85597..6259a57ab5 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.cpp
@@ -532,21 +532,29 @@ namespace AzFramework
 
     void Spawnable::Reflect(AZ::ReflectContext* context)
     {
+        EntityAlias::Reflect(context);
+
         if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
         {
-            serializeContext->Class<Spawnable::EntityAlias>()
-                ->Version(1)
-                ->Field("Spawnable", &Spawnable::EntityAlias::m_spawnable)
-                ->Field("Tag", &Spawnable::EntityAlias::m_tag)
-                ->Field("Source Index", &Spawnable::EntityAlias::m_sourceIndex)
-                ->Field("Target Index", &Spawnable::EntityAlias::m_targetIndex)
-                ->Field("Alias Type", &Spawnable::EntityAlias::m_aliasType)
-                ->Field("Queue Load", &Spawnable::EntityAlias::m_queueLoad);
-
             serializeContext->Class<Spawnable, AZ::Data::AssetData>()->Version(2)
                 ->Field("Meta data", &Spawnable::m_metaData)
                 ->Field("Entity aliases", &Spawnable::m_entityAliases)
                 ->Field("Entities", &Spawnable::m_entities);
         }
     }
+
+    void Spawnable::EntityAlias::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
+        {
+            serializeContext->Class<Spawnable::EntityAlias>()
+                ->Version(1)
+                ->Field("Spawnable", &EntityAlias::m_spawnable)
+                ->Field("Tag", &EntityAlias::m_tag)
+                ->Field("Source Index", &EntityAlias::m_sourceIndex)
+                ->Field("Target Index", &EntityAlias::m_targetIndex)
+                ->Field("Alias Type", &EntityAlias::m_aliasType)
+                ->Field("Queue Load", &EntityAlias::m_queueLoad);
+        }
+    }
 } // namespace AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h b/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h
index f0aa2c7806..f029246847 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h
@@ -62,6 +62,8 @@ namespace AzFramework
             uint32_t m_targetIndex{ 0 }; //!< The index of the entity in the target spawnable that will be used to replace the original.
             EntityAliasType m_aliasType{ EntityAliasType::Original }; //!< The kind of replacement.
             bool m_queueLoad{ false }; //!< Whether or not to automatically queue the spawnable for loading.
+
+            static void Reflect(AZ::ReflectContext* context);
         };
 
         using EntityList = AZStd::vector<AZStd::unique_ptr<AZ::Entity>>;
diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp
index eab681da0d..411ee56687 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp
@@ -97,7 +97,7 @@ namespace AzFramework
 
     void SpawnableAssetHandler::ResolveEntityAliases(
         Spawnable* spawnable,
-        const AZ::Data::Asset<AZ::Data::AssetData>& asset,
+        [[maybe_unused]] const AZ::Data::Asset<AZ::Data::AssetData>& asset,
         AZStd::chrono::milliseconds streamingDeadline,
         AZ::IO::IStreamerTypes::Priority streamingPriority,
         const AZ::Data::AssetFilterCB& assetLoadFilterCB)
diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
index 1e863877a4..37570caec7 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
@@ -317,8 +317,6 @@ namespace AzFramework
         AZ::Entity* previouslySpawnedEntity,
         AZ::SerializeContext& serializeContext)
     {
-        using ResultType = AZStd::pair<AZ::Entity*, uint32_t>;
-
         AZ::Entity* clone = nullptr;
         switch (alias.m_aliasType)
         {