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

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ResourceSelectorHost.cpp
This commit is contained in:
Esteban Papp
2021-08-11 07:55:26 -07:00
parent d71674579a a26d6d5ec9
commit 9f7d280a1e
77 changed files with 248 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/Tests/AZStd/SmartPtr.cpp
+3 -2
View File
@@ -2051,10 +2051,11 @@ namespace UnitTest
TEST_F(SmartPtr, IntrusivePtr_DynamicCast)
{
AZStd::intrusive_ptr<RefCountedClass> basePointer = new RefCountedSubclass;
AZStd::intrusive_ptr<RefCountedSubclass> correctCast = dynamic_pointer_cast<RefCountedSubclass>(basePointer);
AZStd::intrusive_ptr<RefCountedSubclassB> wrongCast = dynamic_pointer_cast<RefCountedSubclassB>(basePointer);
AZStd::intrusive_ptr<RefCountedSubclass> correctCast = azdynamic_cast<RefCountedSubclass *>(basePointer);
AZStd::intrusive_ptr<RefCountedSubclassB> wrongCast = azdynamic_cast<RefCountedSubclassB *>(basePointer);
EXPECT_TRUE(correctCast.get() == basePointer.get());
EXPECT_TRUE(wrongCast.get() == nullptr);