refactor(templates): refining TOptional's constraints
This commit is contained in:
parent
4f769a9207
commit
5c82ab1e0d
@ -14,6 +14,20 @@ NAMESPACE_MODULE_BEGIN(Utility)
|
|||||||
template <typename OptionalType> requires TIsObject<OptionalType>::Value && (!TIsArray<OptionalType>::Value) && TIsDestructible<OptionalType>::Value
|
template <typename OptionalType> requires TIsObject<OptionalType>::Value && (!TIsArray<OptionalType>::Value) && TIsDestructible<OptionalType>::Value
|
||||||
struct TOptional
|
struct TOptional
|
||||||
{
|
{
|
||||||
|
private:
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct TAllowUnwrapping : TBoolConstant<!(
|
||||||
|
TIsConstructible<OptionalType, TOptional<T>& >::Value
|
||||||
|
|| TIsConstructible<OptionalType, const TOptional<T>& >::Value
|
||||||
|
|| TIsConstructible<OptionalType, TOptional<T>&&>::Value
|
||||||
|
|| TIsConstructible<OptionalType, const TOptional<T>&&>::Value
|
||||||
|
|| TIsConvertible< TOptional<T>&, OptionalType>::Value
|
||||||
|
|| TIsConvertible<const TOptional<T>&, OptionalType>::Value
|
||||||
|
|| TIsConvertible< TOptional<T>&&, OptionalType>::Value
|
||||||
|
|| TIsConvertible<const TOptional<T>&&, OptionalType>::Value
|
||||||
|
)> { };
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
using ValueType = OptionalType;
|
using ValueType = OptionalType;
|
||||||
@ -47,14 +61,14 @@ public:
|
|||||||
if (InValue.IsValid()) new(&Value) OptionalType(MoveTemp(InValue.GetValue()));
|
if (InValue.IsValid()) new(&Value) OptionalType(MoveTemp(InValue.GetValue()));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T = OptionalType> requires TIsConstructible<OptionalType, const T&>::Value
|
template <typename T = OptionalType> requires TIsConstructible<OptionalType, const T&>::Value && TAllowUnwrapping<T>::Value
|
||||||
constexpr explicit (!TIsConvertible<const T&, OptionalType>::Value) TOptional(const TOptional<T>& InValue)
|
constexpr explicit (!TIsConvertible<const T&, OptionalType>::Value) TOptional(const TOptional<T>& InValue)
|
||||||
: bIsValid(InValue.IsValid())
|
: bIsValid(InValue.IsValid())
|
||||||
{
|
{
|
||||||
if (InValue.IsValid()) new(&Value) OptionalType(InValue.GetValue());
|
if (InValue.IsValid()) new(&Value) OptionalType(InValue.GetValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T = OptionalType> requires TIsConstructible<OptionalType, T&&>::Value
|
template <typename T = OptionalType> requires TIsConstructible<OptionalType, T&&>::Value && TAllowUnwrapping<T>::Value
|
||||||
constexpr explicit (!TIsConvertible<T&&, OptionalType>::Value) TOptional(TOptional<T>&& InValue)
|
constexpr explicit (!TIsConvertible<T&&, OptionalType>::Value) TOptional(TOptional<T>&& InValue)
|
||||||
: bIsValid(InValue.IsValid())
|
: bIsValid(InValue.IsValid())
|
||||||
{
|
{
|
||||||
@ -106,7 +120,7 @@ public:
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T = OptionalType> requires TIsConstructible<OptionalType, const T&>::Value && TIsAssignable<OptionalType, const T&>::Value
|
template <typename T = OptionalType> requires TIsConstructible<OptionalType, const T&>::Value && TIsAssignable<OptionalType, const T&>::Value && TAllowUnwrapping<T>::Value
|
||||||
constexpr TOptional& operator=(const TOptional<T>& InValue)
|
constexpr TOptional& operator=(const TOptional<T>& InValue)
|
||||||
{
|
{
|
||||||
if (&InValue == this) return *this;
|
if (&InValue == this) return *this;
|
||||||
@ -127,7 +141,7 @@ public:
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T = OptionalType> requires TIsConstructible<OptionalType, T&&>::Value && TIsAssignable<OptionalType, T&&>::Value
|
template <typename T = OptionalType> requires TIsConstructible<OptionalType, T&&>::Value && TIsAssignable<OptionalType, T&&>::Value && TAllowUnwrapping<T>::Value
|
||||||
constexpr TOptional& operator=(TOptional<T>&& InValue)
|
constexpr TOptional& operator=(TOptional<T>&& InValue)
|
||||||
{
|
{
|
||||||
if (&InValue == this) return *this;
|
if (&InValue == this) return *this;
|
||||||
|
Loading…
Reference in New Issue
Block a user