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
@@ -63,7 +63,7 @@ namespace AZ
                SceneGraph m_graph;
                SceneManifest m_manifest;
                SceneOrientation m_originalOrientation = SceneOrientation::YUp;
-            AZ_POP_DISABLE_OVERRIDE_WARNING
+            AZ_POP_DISABLE_WARNING
            };
        } // Containers
    } // SceneAPI
@@ -106,7 +106,7 @@ namespace AZ
            AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
                StorageLookup m_storageLookup;
                ValueStorage m_values;
-            AZ_POP_DISABLE_OVERRIDE_WARNING
+            AZ_POP_DISABLE_WARNING
            };
        } // Containers
    } // SceneAPI
@@ -55,7 +55,7 @@ namespace AZ::SceneAPI
            AZ::Transform   m_targetTransform;
            AZ::Transform   m_conversionTransform;
            AZ::Transform   m_conversionTransformInversed;
-            AZ_POP_DISABLE_OVERRIDE_WARNING
+            AZ_POP_DISABLE_WARNING
            AZ::u32         m_targetBasisIndices[3];
            bool            m_needsConversion;
            bool            m_sourceRightHanded;