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

Modernization + AZStd::function compare fix. (#3680)

Browse Source 
* Modernization + small fix.

Modernize ( `bool`/`override`/other) code in AzCore, AzFramework, AzQtComponents, AzToolsFramework, etc.
Replaced a `bind` or two, use `using` in a few places as well.

Fix nullptr comparison of AZStd::function.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply review-based changes

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-09-02 21:55:09 +02:00
committed by GitHub
parent b3c8b0f5f3
commit 567c0ae24d
150 changed files with 865 additions and 847 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/Tests/Script.cpp
+4 -4
View File
@@ -1382,7 +1382,7 @@ namespace UnitTest
static int s_errorCount = 0;
IncompleteType* s_globalIncompletePtr = static_cast<IncompleteType*>(AZ_INVALID_POINTER);
IncompleteType* s_globalIncompletePtr1 = 0;
IncompleteType* s_globalIncompletePtr1 = nullptr;
void GlobalVarSet(int v)
{
@@ -2234,7 +2234,7 @@ namespace UnitTest
// incomplete types passed by a light-user data (pointer reference)
AZ_TEST_ASSERT(s_globalIncompletePtr == reinterpret_cast<IncompleteType*>(AZ_INVALID_POINTER));
AZ_TEST_ASSERT(s_globalIncompletePtr1 == 0);
AZ_TEST_ASSERT(s_globalIncompletePtr1 == nullptr);
script.Execute("globalIncomplete1 = globalIncomplete");
AZ_TEST_ASSERT(s_globalIncompletePtr1 == s_globalIncompletePtr);
@@ -3157,7 +3157,7 @@ namespace UnitTest
char stackOutput[2048];
debugContext->StackTrace(stackOutput, AZ_ARRAY_SIZE(stackOutput));
AZ_Printf("Script", "%s", stackOutput);
AZ_TEST_ASSERT(strstr(stackOutput, "GlobalFunction") != 0);
AZ_TEST_ASSERT(strstr(stackOutput, "GlobalFunction") != nullptr);
AZ_TEST_ASSERT(breakpoint->m_lineNumber == 20);
}
else if (m_numBreakpointHits == 2)
@@ -3193,7 +3193,7 @@ namespace UnitTest
char stackOutput[2048];
debugContext->StackTrace(stackOutput, AZ_ARRAY_SIZE(stackOutput));
AZ_Printf("Script", "%s", stackOutput);
AZ_TEST_ASSERT(strstr(stackOutput, "GlobalMult") != 0);
AZ_TEST_ASSERT(strstr(stackOutput, "GlobalMult") != nullptr);
AZ_TEST_ASSERT(breakpoint->m_lineNumber == 23);
}