Merge branch 'development' into cmake/linux_fix_warn_unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-26 08:23:02 -07:00
parent e5e271f45a 040b75c02c
commit 906ace3d03
66 changed files with 331 additions and 232 deletions
@@ -77,11 +77,4 @@ namespace AZ::Debug
    };
 } // namespace AZ::Debug

-#ifdef USE_PIX
-// The pix3 header unfortunately brings in other Windows macros we need to undef
-#undef DeleteFile
-#undef LoadImage
-#undef GetCurrentTime
-#endif
-
 #include <AzCore/Debug/Profiler.inl>
@@ -70,3 +70,13 @@
 #if defined(GetCommandLine)
    #undef GetCommandLine
 #endif
+#if defined(LoadImage)
+#undef LoadImage
+#endif
+#if defined(DeleteFile)
+#undef DeleteFile
+#endif
+#if defined(GetCurrentTime)
+#undef GetCurrentTime
+#endif
+