linuxdeepin
/
dtkcore
mirror of https://github.com/linuxdeepin/dtkcore
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fix trivially copy/move constructiable type can't be constructed 

由于在C++20中引入的Concept机制和SFINAE机制完全不一样,在C++20之前无法做到相同形式的约束效果,所以放宽约束条件

Log: 修复可平凡构造类型不能被构造的错误
This commit is contained in:
heyuming 2022-12-12 11:19:00 +08:00 committed by Comix
parent 2cd5464f08
commit 52ecc7031e
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/base/dexpected.h
View File

@ -469,18 +469,11 @@ public:
{
}
/*!
* @brief Dtk::Core::DExpected的默认拷贝构造函数
*/
DExpected(const DExpected &) = default;
/*!
* @brief Dtk::Core::DExpected的拷贝构造函数
*/
template <typename std::enable_if<std::is_copy_constructible<T>::value and std::is_copy_constructible<E>::value and
(!std::is_trivially_copy_constructible<T>::value or
!std::is_trivially_copy_constructible<E>::value),
bool>::type = true>
template <
typename std::enable_if<std::is_copy_constructible<T>::value and std::is_copy_constructible<E>::value, bool>::type = true>
DExpected(const DExpected &_x) noexcept(
std::is_nothrow_copy_constructible<T>::value and std::is_nothrow_copy_constructible<E>::value)
: m_has_value(_x.m_has_value)
@ -491,18 +484,11 @@ public:
construct_at(std::addressof(m_error), _x.m_error);
}
/*!
* @brief Dtk::Core::DExpected的默认移动构造函数
*/
DExpected(DExpected &&) = default;
/*!
* @brief Dtk::Core::DExpected的移动构造函数
*/
template <typename std::enable_if<std::is_move_constructible<T>::value and std::is_move_constructible<E>::value and
(!std::is_trivially_move_constructible<T>::value or
!std::is_trivially_move_constructible<E>::value),
bool>::type = true>
template <
typename std::enable_if<std::is_move_constructible<T>::value and std::is_move_constructible<E>::value, bool>::type = true>
DExpected(DExpected &&_x) noexcept(
std::is_nothrow_move_constructible<T>::value and std::is_nothrow_move_constructible<E>::value)
: m_has_value(_x.m_has_value)
@ -1244,10 +1230,7 @@ public:
{
}
DExpected(const DExpected &) = default;
template <typename std::enable_if<std::is_copy_constructible<E>::value and !std::is_trivially_copy_constructible<E>::value,
bool>::type = true>
template <typename std::enable_if<std::is_copy_constructible<E>::value, bool>::type = true>
DExpected(const DExpected &_x) noexcept(std::is_nothrow_copy_constructible<E>::value)
: m_has_value(_x.m_has_value)
, m_void()
@ -1256,10 +1239,7 @@ public:
construct_at(std::addressof(m_error), _x.m_error);
}
DExpected(DExpected &&) = default;
template <typename std::enable_if<std::is_move_constructible<E>::value and !std::is_trivially_move_constructible<E>::value,
bool>::type = true>
template <typename std::enable_if<std::is_move_constructible<E>::value, bool>::type = true>
DExpected(DExpected &&_x) noexcept(std::is_nothrow_move_constructible<E>::value)
: m_has_value(_x.m_has_value)
, m_void()