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/Serialization.cpp
+4 -4
View File
@@ -2231,7 +2231,7 @@ TEST_F(SerializeBasicTest, BasicTypeTest_Succeed)
(void)classId;
DeprecationTestClass* obj = reinterpret_cast<DeprecationTestClass*>(classPtr);
EXPECT_EQ( 0, obj->m_deprecated.m_data );
EXPECT_EQ( NULL, obj->m_deprecatedPtr );
EXPECT_EQ( nullptr, obj->m_deprecatedPtr );
EXPECT_EQ( 0, obj->m_oldClassData );
EXPECT_EQ( 0.f, obj->m_newClassData );
EXPECT_EQ( 0, obj->m_missingMember );
@@ -4057,7 +4057,7 @@ namespace UnitTest
if (strcmp(classData->m_name, "MyEditStruct") == 0)
{
EXPECT_TRUE(classData->m_editData != NULL);
EXPECT_TRUE(classData->m_editData != nullptr);
EXPECT_EQ( 0, strcmp(classData->m_editData->m_name, "MyEditStruct") );
EXPECT_EQ( 0, strcmp(classData->m_editData->m_description, "My edit struct class used for ...") );
EXPECT_EQ( 2, classData->m_editData->m_elements.size() );
@@ -4071,12 +4071,12 @@ namespace UnitTest
// Number of options attribute
EXPECT_EQ(classElement->m_editData->m_attributes[0].first, AZ_CRC("NumOptions", 0x90274abc));
Edit::AttributeData<int>* intData = azrtti_cast<Edit::AttributeData<int>*>(classElement->m_editData->m_attributes[0].second);
EXPECT_TRUE(intData != NULL);
EXPECT_TRUE(intData != nullptr);
EXPECT_EQ( 3, intData->Get(instance) );
// Get options attribute
EXPECT_EQ( classElement->m_editData->m_attributes[1].first, AZ_CRC("Options", 0xd035fa87));
Edit::AttributeFunction<int(int)>* funcData = azrtti_cast<Edit::AttributeFunction<int(int)>*>(classElement->m_editData->m_attributes[1].second);
EXPECT_TRUE(funcData != NULL);
EXPECT_TRUE(funcData != nullptr);
EXPECT_EQ( 20, funcData->Invoke(instance, 10) );
}
return true;