Merge branch 'development' into cmake/linux_fix_warn_unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Framework/AzCore/AzCore/Math/Guid.h # cmake/Platform/Common/MSVC/Configurations_msvc.cmake
2021-08-25 15:40:41 -07:00
parent fded2bafad b9daf7f7c3
commit ae4cfc3bd3
19 changed files with 43 additions and 41 deletions
@@ -14,7 +14,7 @@
 // Disable warnings in moc code
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option")
 #include <Editor/View/Widgets/LoggingPanel/PivotTree/ui_PivotTreeWidget.h>
-AZ_POP_DISABLE_OVERRIDE_WARNING
+AZ_POP_DISABLE_WARNING

 namespace ScriptCanvasEditor
 {