Move JsonUtils.h for support of SC serialization

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-08-13 21:53:20 -07:00
parent a56be14677
commit 5044204839
43 changed files with 96 additions and 75 deletions
@@ -13,8 +13,6 @@ set(FILES
Instance/InstanceData.h
Instance/InstanceData.cpp
Instance/InstanceDatabase.h
Serialization/Json/JsonUtils.h
Serialization/Json/JsonUtils.cpp
std/containers/array_view.h
std/containers/fixed_vector_set.h
std/containers/lru_cache.h
@@ -13,7 +13,7 @@
#include <AzTest/AzTest.h>
#include <AtomCore/Serialization/Json/JsonUtils.h>
#include <AzToolsFramework/Serialization/Json/JsonUtils.h>
namespace UnitTest
{
@@ -6,7 +6,6 @@
*
*/
#include <AtomCore/Serialization/Json/JsonUtils.h>
#include <AzCore/Utils/Utils.h>
#include <AzCore/base.h>
#include <AzCore/Component/ComponentApplicationBus.h>
@@ -23,6 +22,8 @@
#include <AzCore/Serialization/Utils.h>
#include <AzCore/Utils/Utils.h>
#include "JsonUtils.h"
namespace AZ
{
namespace JsonSerializationUtils
@@ -343,9 +344,9 @@ namespace AZ
{
return AZ::Failure(deserializeErrors);
}
return AZ::Success();
}
}
AZ::Outcome<AZStd::any, AZStd::string> LoadAnyObjectFromStream(IO::GenericStream& stream, const JsonDeserializerSettings* settings)
{
@@ -15,6 +15,8 @@
#include <AzCore/JSON/writer.h>
#include <AzCore/Serialization/Json/JsonSerializationResult.h>
// hello?
namespace AZ
{
namespace IO
@@ -205,6 +205,8 @@ set(FILES
PropertyTreeEditor/PropertyTreeEditorComponent.h
Render/EditorIntersectorComponent.cpp
Render/EditorIntersectorComponent.h
Serialization/Json/JsonUtils.h
Serialization/Json/JsonUtils.cpp
Slice/SliceDataFlagsCommand.h
Slice/SliceDataFlagsCommand.cpp
Slice/SliceUtilities.h