浏览代码

New move assignment operator behaviour adapted (fixes #110).

main
offa 7 年前
父节点
当前提交
e3ac790362
共有 1 个文件被更改,包括 21 次插入10 次删除
  1. +21
    -10
      include/unique_resource.h

+ 21
- 10
include/unique_resource.h 查看文件

@@ -161,20 +161,31 @@ namespace sr
{
reset();

if constexpr( std::is_nothrow_move_assignable_v<R> == true )
if constexpr( std::is_nothrow_move_assignable_v<RR> == true )
{
m_deleter.reset(detail::forward_if_nothrow_move_constructible(other.m_deleter.get()));
m_resource.reset(std::forward<RR>(other.m_resource.get()));
}
else if constexpr( std::is_nothrow_move_assignable_v<D> == true )
{
m_resource.reset(detail::forward_if_nothrow_move_constructible(other.m_resource.get()));
m_deleter.reset(std::forward<DD>(other.m_deleter.get()));
if constexpr( std::is_nothrow_move_assignable_v<DD> == true )
{
m_resource.reset(std::forward<RR>(other.m_resource.get()));
m_deleter.reset(std::forward<DD>(other.m_deleter.get()));
}
else
{
m_deleter.reset(other.m_deleter.get());
m_resource.reset(std::forward<RR>(other.m_resource.get()));
}
}
else
{
m_resource = other.m_resource;
m_deleter = other.m_deleter;
if constexpr( std::is_nothrow_move_assignable_v<DD> == true )
{
m_resource.reset(other.m_resource.get());
m_deleter.reset(std::forward<DD>(other.m_deleter.get()));
}
else
{
m_resource.reset(other.m_resource.get());
m_deleter.reset(other.m_deleter.get());
}
}

m_execute_on_destruction = std::exchange(other.m_execute_on_destruction, false);

正在加载...
取消
保存