|
@@ -193,7 +193,7 @@ namespace AZStd
|
|
m_typeInfo.m_handler(Action::Reserve, this, nullptr);
|
|
m_typeInfo.m_handler(Action::Reserve, this, nullptr);
|
|
|
|
|
|
// Call copy constructor
|
|
// Call copy constructor
|
|
- construct<decay_t<ValueType>>(this, forward<ValueType>(val));
|
|
|
|
|
|
+ construct<decay_t<ValueType>>(this, AZStd::forward<ValueType>(val));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -248,7 +248,7 @@ namespace AZStd
|
|
template <typename ValueType, typename = enable_if_t<!is_same<decay_t<ValueType>, any>::value>>
|
|
template <typename ValueType, typename = enable_if_t<!is_same<decay_t<ValueType>, any>::value>>
|
|
any& operator=(ValueType&& val)
|
|
any& operator=(ValueType&& val)
|
|
{
|
|
{
|
|
- any(forward<ValueType>(val)).swap(*this);
|
|
|
|
|
|
+ any(AZStd::forward<ValueType>(val)).swap(*this);
|
|
return *this;
|
|
return *this;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -289,7 +289,7 @@ namespace AZStd
|
|
template<typename ValueType, typename ParamType> // ParamType must be deduced to allow universal ref
|
|
template<typename ValueType, typename ParamType> // ParamType must be deduced to allow universal ref
|
|
static void construct(AZStd::any* dest, ParamType&& value, AZStd::enable_if_t<AZStd::is_constructible_v<ValueType, ParamType>, AZStd::true_type*> = nullptr /* AZStd::is_constructible_v<ValueType, ParamType>*/)
|
|
static void construct(AZStd::any* dest, ParamType&& value, AZStd::enable_if_t<AZStd::is_constructible_v<ValueType, ParamType>, AZStd::true_type*> = nullptr /* AZStd::is_constructible_v<ValueType, ParamType>*/)
|
|
{
|
|
{
|
|
- new (dest->get_data()) ValueType(forward<ParamType>(value));
|
|
|
|
|
|
+ new (dest->get_data()) ValueType(AZStd::forward<ParamType>(value));
|
|
}
|
|
}
|
|
|
|
|
|
// The ValueType is not copy constructible in this case
|
|
// The ValueType is not copy constructible in this case
|