From 6063e3a391651bb8744123ed567cd4e48d7ad5c1 Mon Sep 17 00:00:00 2001 From: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com> Date: Wed, 9 Jun 2021 11:07:28 -0700 Subject: [PATCH] Simplified Json Serializer registration code Updated the Json Serializer registeration code in the RegistrationContext.cpp to use try_emplace instead of find + end check + insert. --- .../Serialization/Json/RegistrationContext.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.cpp index 50ea08e0a0..9aa80a2ef2 100644 --- a/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.cpp +++ b/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.cpp @@ -47,19 +47,11 @@ namespace AZ if (!overwriteExisting) { - auto serializerIter = m_context->m_handledTypesMap.find(uuid); - if (serializerIter == m_context->m_handledTypesMap.end()) - { - m_context->m_handledTypesMap.emplace(uuid, serializer); - } - else - { - AZ_Assert( - false, - "Couldn't register Json serializer %s. Another serializer (%s) has already been registered for the same Uuid (%s).", - serializer->RTTI_GetTypeName(), serializerIter->second->RTTI_GetTypeName(), - serializerIter->first.ToString().c_str()); - } + auto emplaceResult = m_context->m_handledTypesMap.try_emplace(uuid, serializer); + AZ_Assert( + emplaceResult.second, + "Couldn't register Json serializer %s. Another serializer (%s) has already been registered for the same Uuid (%s).", + serializer->RTTI_GetTypeName(), emplaceResult.first->second->RTTI_GetTypeName(), uuid); } else {