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/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ namespace ScriptEvents
{
// Iterate from end of parameters and count the number of consecutive valid BehaviorValue objects
size_t numDefaultArguments = 0;
for (size_t i = GetNumArguments() - 1; i >= 0 && GetDefaultValue(i); --i, ++numDefaultArguments)
for (int i = static_cast<int>(GetNumArguments()) - 1; i >= 0 && GetDefaultValue(static_cast<size_t>(i)); --i, ++numDefaultArguments)
{
}
return GetNumArguments() - numDefaultArguments;
Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ namespace ScriptEvents
{
// Iterate from end of parameters and count the number of consecutive valid BehaviorValue objects
size_t numDefaultArguments = 0;
for (size_t i = GetNumArguments() - 1; i >= 0 && GetDefaultValue(i); --i, ++numDefaultArguments)
for (int i = static_cast<int>(GetNumArguments()) - 1; i >= 0 && GetDefaultValue(static_cast<size_t>(i)); --i, ++numDefaultArguments)
{
}
return GetNumArguments() - numDefaultArguments;