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

Merge branch 'development' into cmake/linux_fix_warn_unused

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 14:51:35 -07:00
parent ea2f74dc0f c8c29b1aff
commit b96b99363c
241 changed files with 5654 additions and 5352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
+2
View File
@@ -104,7 +104,9 @@ namespace ScriptCanvas
private:\
static AZStd::string_view GetName(size_t i)\
{\
AZ_PUSH_DISABLE_WARNING(4296, "-Wunknown-warning-option")\
static_assert(s_numArgs <= s_numNames, "Number of arguments is greater than number of names in " #NODE_NAME );\
AZ_POP_DISABLE_WARNING\
/*static_assert(s_numResults <= s_numNames, "Number of results is greater than number of names in " #NODE_NAME );*/\
/*static_assert((s_numResults + s_numArgs) == s_numNames, "Argument name count + result name count != name count in " #NODE_NAME );*/\
static const AZStd::array<AZStd::string_view, s_numNames> s_names = {{ __VA_ARGS__ }};\
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp
+7 -7
View File
@@ -575,7 +575,7 @@ namespace ScriptCanvas
const SlotExecution::Map* slotExecutionMap = GetSlotExecutionMap();
const auto& executionIns = slotExecutionMap->GetIns();
if (methodIndex < 0 || methodIndex >= executionIns.size())
if (methodIndex >= executionIns.size())
{
return;
}
@@ -655,7 +655,7 @@ namespace ScriptCanvas
AZ::Outcome<void, AZStd::string> NodeableNodeOverloaded::IsValidConfiguration(size_t methodIndex, const DataIndexMapping& inputMapping, const DataIndexMapping& outputMapping)
{
if (methodIndex < 0 || methodIndex >= m_methodConfigurations.size())
if (methodIndex >= m_methodConfigurations.size())
{
return AZ::Failure(AZStd::string("Trying to access unknown method index."));
}
@@ -716,7 +716,7 @@ namespace ScriptCanvas
const SlotExecution::Map* slotExecutionMap = GetSlotExecutionMap();
const auto& executionIns = slotExecutionMap->GetIns();
if (methodIndex < 0 || methodIndex >= executionIns.size())
if (methodIndex >= executionIns.size())
{
return AZ::Failure(AZStd::string("Invalid method index given to Nodeable"));;
}
@@ -785,7 +785,7 @@ namespace ScriptCanvas
return AZ::Success();
}
if (methodIndex < 0 || methodIndex >= m_methodConfigurations.size())
if (methodIndex >= m_methodConfigurations.size())
{
return AZ::Failure(AZStd::string("Invalid Method index given to Nodeable Node Overloaded."));
}
@@ -826,7 +826,7 @@ namespace ScriptCanvas
{
static const DataTypeSet k_emptySet;
if (methodIndex >= 0 && methodIndex < m_methodSelections.size())
if (methodIndex < m_methodSelections.size())
{
const OverloadConfiguration& overloadConfiguration = m_methodConfigurations[methodIndex];
size_t startIndex = NodeableNodeOverloadedCpp::AdjustForHiddenNodeableThisPointer(overloadConfiguration, 0);
@@ -845,7 +845,7 @@ namespace ScriptCanvas
return AZ::Success();
}
if (methodIndex < 0 || methodIndex >= m_methodConfigurations.size())
if (methodIndex >= m_methodConfigurations.size())
{
return AZ::Failure(AZStd::string("Invalid Method index given to Nodeable Node Overloaded."));
}
@@ -883,7 +883,7 @@ namespace ScriptCanvas
{
static const DataTypeSet k_emptySet;
if (methodIndex >= 0 && methodIndex < m_methodSelections.size())
if (methodIndex < m_methodSelections.size())
{
return m_methodSelections[methodIndex].FindPossibleInputTypes(index);
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ namespace SubgraphInterfaceCpp
AZ_INLINE const char* GetTabs(size_t tabs)
{
AZ_Assert(tabs >= 0 && tabs <= k_maxTabs, "invalid argument to GetTabs");
AZ_Assert(tabs <= k_maxTabs, "invalid argument to GetTabs");
static const char* const k_tabs[] =
{
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringGenerics.h
+1 -1
View File
@@ -34,7 +34,7 @@ namespace ScriptCanvas
{
length = AZ::GetClamp<AZ::u32>(length, 0, aznumeric_cast<AZ::u32>(sourceString.size()));
if (length == 0 || index < 0 || index >= sourceString.size())
if (length == 0 || index >= sourceString.size())
{
return {};
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationUtilities.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ namespace TranslationUtilitiesCPP
AZ_INLINE const char* GetTabs(size_t tabs)
{
AZ_Assert(tabs >= 0 && tabs <= k_maxTabs, "invalid argument to GetTabs");
AZ_Assert(tabs <= k_maxTabs, "invalid argument to GetTabs");
static const char* const k_tabs[] =
{