birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced AzFramework::FileFunc JSON utils API calls with AzCore::JsonUtils APIs that appear to have been duplicated. Also fixed up improper Project Configurator -> Project Manager comment replacements.

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2021-08-30 14:10:30 -05:00
parent dbf12ae697
commit 194205c453
21 changed files with 45 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp
+2 -3
View File
@@ -9,9 +9,9 @@
#include <AzCore/IO/Path/Path.h>
#include <AzCore/JSON/schema.h>
#include <AzCore/JSON/prettywriter.h>
#include <AzCore/Serialization/Json/JsonUtils.h>
#include <AzCore/Settings/SettingsRegistry.h>
#include <AzCore/Settings/SettingsRegistryImpl.h>
#include <AzFramework/FileFunc/FileFunc.h>
#include <AzFramework/StringFunc/StringFunc.h>
#include <AWSCoreInternalBus.h>
@@ -211,8 +211,7 @@ namespace AWSCore
}
AzFramework::StringFunc::Path::Normalize(configJsonPath);
AZ::IO::Path configJsonFileIOPath(configJsonPath);
auto readJsonOutcome = AzFramework::FileFunc::ReadJsonFile(configJsonFileIOPath);
auto readJsonOutcome = AZ::JsonSerializationUtils::ReadJsonFile(configJsonPath);
if (readJsonOutcome.IsSuccess())
{
auto jsonDocument = readJsonOutcome.TakeValue();