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

more Code/Framework fixes

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-07 18:37:45 -07:00
parent 9e0ff8e55d
commit cc00a535d7
11 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/Component/Component.h
+1 -1
View File
@@ -266,7 +266,7 @@ namespace AZ
_ComponentClass::RTTI_Type().ToString<AZStd::string>().c_str(), descriptor->GetName(), _ComponentClass::RTTI_TypeName()); \
return nullptr; \
} \
else if (descriptor->GetName() != _ComponentClass::RTTI_TypeName()) \
if (descriptor->GetName() != _ComponentClass::RTTI_TypeName()) \
{ \
AZ_Error("Component", false, "The same component UUID (%s) / name (%s) was registered twice. This isn't allowed, " \
"it can cause lifetime management issues / crashes.\nThis situation can happen by declaring a component " \
Code/Framework/AzCore/AzCore/RTTI/RTTI.h
+1 -4
View File
@@ -941,10 +941,7 @@ namespace AZ
{
return AZStd::shared_ptr<DestType>(ptr, castPtr);
}
else
{
return AZStd::shared_ptr<DestType>();
}
return AZStd::shared_ptr<DestType>();
}
// RttiCast specialization for intrusive_ptr.