diff --git a/Code/Editor/Util/PathUtil.cpp b/Code/Editor/Util/PathUtil.cpp index 22c638e289..3ca4b6222c 100644 --- a/Code/Editor/Util/PathUtil.cpp +++ b/Code/Editor/Util/PathUtil.cpp @@ -254,7 +254,7 @@ namespace Path } AZStd::string str(GetGameAssetsFolder()); str += "Mods\\"; - str += s_currentModName; + str += s_currentModName.c_str(); return str; } diff --git a/Code/Legacy/CryCommon/CryTypeInfo.cpp b/Code/Legacy/CryCommon/CryTypeInfo.cpp index 5f0cb47b63..b1f7f20601 100644 --- a/Code/Legacy/CryCommon/CryTypeInfo.cpp +++ b/Code/Legacy/CryCommon/CryTypeInfo.cpp @@ -16,6 +16,7 @@ #include "CrySizer.h" #include "CryEndian.h" #include "TypeInfo_impl.h" +#include // Traits #if defined(AZ_RESTRICTED_PLATFORM) @@ -131,9 +132,9 @@ const CTypeInfo&PtrTypeInfo() // bool AZStd::string ToString(bool const& val) { - static AZStd::fixed_string sTrue = "true"; - static AZStd::fixed_string sFalse = "false"; - return val ? sTrue : sFalse; + static AZStd::fixed_string<5> sTrue = "true"; + static AZStd::fixed_string<6> sFalse = "false"; + return val ? sTrue.c_str() : sFalse.c_str(); } bool FromString(bool& val, cstr s) diff --git a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h index b759fea158..48310091b3 100644 --- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h +++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h @@ -11,6 +11,7 @@ #include #include #include +#include namespace AZ { @@ -18,7 +19,7 @@ namespace AZ { namespace DataTypes { - const static AZStd::fixed_string s_advancedDisabledString = "Disabled"; + static AZStd::string s_advancedDisabledString = "Disabled"; class IMeshAdvancedRule : public IRule diff --git a/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.cpp index e41e39dd0a..d58a89a110 100644 --- a/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.cpp +++ b/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.cpp @@ -18,11 +18,6 @@ namespace AZ { namespace DataTypes = AZ::SceneAPI::DataTypes; - const AZStd::fixed_string<8> MaterialData::s_DiffuseMapName = "Diffuse"; - const AZStd::fixed_string<9> MaterialData::s_SpecularMapName = "Specular"; - const AZStd::fixed_string<5> MaterialData::s_BumpMapName = "Bump"; - const AZStd::fixed_string<1> MaterialData::s_emptyString = ""; - MaterialData::MaterialData() : m_isNoDraw(false) , m_diffuseColor(AZ::Vector3::CreateOne()) @@ -72,7 +67,7 @@ namespace AZ return result->second; } - return s_emptyString; + return m_emptyString; } void MaterialData::SetNoDraw(bool isNoDraw) diff --git a/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.h b/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.h index 8c8f8bd66e..2a83a53c53 100644 --- a/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.h +++ b/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.h @@ -11,6 +11,7 @@ #include #include #include +#include namespace AZ { @@ -96,10 +97,7 @@ namespace AZ bool m_isNoDraw; - const static AZStd::fixed_string<8> s_DiffuseMapName; - const static AZStd::fixed_string<9> s_SpecularMapName; - const static AZStd::fixed_string<5> s_BumpMapName; - const static AZStd::fixed_string<1> s_emptyString; + const AZStd::string m_emptyString; // A unique id which is used to identify a material in a fbx. // This is the same as the ID in the fbx file's FbxNode