izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

#ue4 nullptr fixes.

Browse Source 
#add TYPE_OF_NULLPTR added to platform layer.
#add TYPE_OF_NULLPTR set to be decltype(__nullptr) on XB1, because it's compiled under C++/CX where nullptr has a different meaning.
#change TWeakObjectPtr operators changes to use TYPE_OF_NULLPTR.

#codereview robert.manuszewski,max.preussner

[CL 2039998 by Steve Robb in Main branch]
This commit is contained in:
Steve Robb
2014-04-23 17:33:26 -04:00
committed by UnrealBot
parent e71522ade5
commit 1142bfa3d6
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatform.h
View File

@@ -59,5 +59,6 @@ struct FGenericPlatformTypes
typedef UPTRINT SIZE_T; // signed int the same size as a pointer
typedef int32 TYPE_OF_NULL;
typedef decltype(nullptr) TYPE_OF_NULLPTR;
};

3
Engine/Source/Runtime/Core/Public/HAL/Platform.h
View File

@@ -509,7 +509,8 @@ typedef FPlatformTypes::UPTRINT UPTRINT; ///< An unsigned integer the same size
typedef FPlatformTypes::PTRINT PTRINT; ///< A signed integer the same size as a pointer
typedef FPlatformTypes::SIZE_T SIZE_T; ///< A signed integer the same size as a pointer
typedef FPlatformTypes::TYPE_OF_NULL TYPE_OF_NULL; ///< The type of the NULL constant.
typedef FPlatformTypes::TYPE_OF_NULL TYPE_OF_NULL; ///< The type of the NULL constant.
typedef FPlatformTypes::TYPE_OF_NULLPTR TYPE_OF_NULLPTR; ///< The type of the C++ nullptr keyword.
//------------------------------------------------------------------
// Test the global types

8
Engine/Source/Runtime/Core/Public/UObject/WeakObjectPtrTemplates.h
View File

@@ -226,13 +226,13 @@ FORCENOINLINE bool operator==(const LhsT* Lhs, const TWeakObjectPtr<RhsT, OtherT
}
template <typename LhsT, typename OtherTWeakObjectPtrBase, typename OtherTUObjectArray>
FORCENOINLINE bool operator==(const TWeakObjectPtr<LhsT, OtherTWeakObjectPtrBase, OtherTUObjectArray> &Lhs, decltype(nullptr))
FORCENOINLINE bool operator==(const TWeakObjectPtr<LhsT, OtherTWeakObjectPtrBase, OtherTUObjectArray> &Lhs, TYPE_OF_NULLPTR)
{
return !Lhs.IsValid();
}
template <typename RhsT, typename OtherTWeakObjectPtrBase, typename OtherTUObjectArray>
FORCENOINLINE bool operator==(decltype(nullptr), const TWeakObjectPtr<RhsT, OtherTWeakObjectPtrBase, OtherTUObjectArray> &Rhs)
FORCENOINLINE bool operator==(TYPE_OF_NULLPTR, const TWeakObjectPtr<RhsT, OtherTWeakObjectPtrBase, OtherTUObjectArray> &Rhs)
{
return !Rhs.IsValid();
}
@@ -272,13 +272,13 @@ FORCENOINLINE bool operator!=(const RhsT* Lhs, const TWeakObjectPtr<LhsT, OtherT
}
template <typename LhsT, typename OtherTWeakObjectPtrBase, typename OtherTUObjectArray>
FORCENOINLINE bool operator!=(const TWeakObjectPtr<LhsT, OtherTWeakObjectPtrBase, OtherTUObjectArray> &Lhs, decltype(nullptr))
FORCENOINLINE bool operator!=(const TWeakObjectPtr<LhsT, OtherTWeakObjectPtrBase, OtherTUObjectArray> &Lhs, TYPE_OF_NULLPTR)
{
return Lhs.IsValid();
}
template <typename RhsT, typename OtherTWeakObjectPtrBase, typename OtherTUObjectArray>
FORCENOINLINE bool operator!=(decltype(nullptr), const TWeakObjectPtr<RhsT, OtherTWeakObjectPtrBase, OtherTUObjectArray> &Rhs)
FORCENOINLINE bool operator!=(TYPE_OF_NULLPTR, const TWeakObjectPtr<RhsT, OtherTWeakObjectPtrBase, OtherTUObjectArray> &Rhs)
{
return Rhs.IsValid();
}