From d7ec767ebcb7777cee5f2dd19de7e0d7f22123d5 Mon Sep 17 00:00:00 2001
From: Chris Burel <burelc@amazon.com>
Date: Fri, 11 Jun 2021 15:43:09 -0700
Subject: [PATCH] Enable `-Wnon-pod-varargs` (#1278)

---
 .../AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp      | 2 +-
 .../AzToolsFramework/Prefab/PrefabPublicHandler.cpp             | 2 +-
 cmake/Platform/Common/Clang/Configurations_clang.cmake          | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
index 5cdd028bbb..6805575d95 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
@@ -230,7 +230,7 @@ namespace AzToolsFramework::AssetUtils
             AZStd::vector<AzFramework::GemInfo> gemInfoList;
             if (!AzFramework::GetGemsInfo(gemInfoList, *settingsRegistry))
             {
-                AZ_Error("AzToolsFramework::AssetUtils", false, "Failed to read gems from project folder(%s).\n", projectPath);
+                AZ_Error("AzToolsFramework::AssetUtils", false, "Failed to read gems from project folder(%.*s).\n", AZ_STRING_ARG(projectPath));
                 return {};
             }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index 690d408007..189cb9d161 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -336,7 +336,7 @@ namespace AzToolsFramework
             {
                 // Load the template from the file
                 templateId = m_prefabLoaderInterface->LoadTemplateFromFile(filePath);
-                AZ_Assert(templateId != InvalidTemplateId, "Template with source path %s couldn't be loaded correctly.", filePath);
+                AZ_Assert(templateId != InvalidTemplateId, "Template with source path %.*s couldn't be loaded correctly.", AZ_STRING_ARG(filePath));
             }
 
             const PrefabDom& templateDom = m_prefabSystemComponentInterface->FindTemplateDom(templateId);
diff --git a/cmake/Platform/Common/Clang/Configurations_clang.cmake b/cmake/Platform/Common/Clang/Configurations_clang.cmake
index 768b7dd4c2..4f9b3154e6 100644
--- a/cmake/Platform/Common/Clang/Configurations_clang.cmake
+++ b/cmake/Platform/Common/Clang/Configurations_clang.cmake
@@ -40,7 +40,6 @@ ly_append_configurations_options(
         -Wno-unused-private-field
         -Wno-unused-value
         -Wno-unused-variable
-        -Wno-non-pod-varargs
         -Wno-unused-lambda-capture
         # Workaround for compiler seeing file case differently from what OS show in console.
         -Wno-nonportable-include-path