Explorar el Código

Both mctor implementations of scope_guard_base refactored into one. The

handling of nothrow moveconstructible or not is now handled through
std::move_if_noexcept() (fixes #77).
main
offa hace 7 años
padre
commit
6a378724e3
Se han modificado 1 ficheros con 3 adiciones y 18 borrados
  1. +3
    -18
      include/detail/scope_guard_base.h

+ 3
- 18
include/detail/scope_guard_base.h Ver fichero

@@ -69,25 +69,10 @@ namespace detail
throw;
}

template<class T = EF,
std::enable_if_t<std::is_nothrow_move_constructible<T>::value, int> = 0
>
scope_guard_base(scope_guard_base&& other) noexcept(std::is_nothrow_move_constructible<T>::value
|| std::is_nothrow_copy_constructible<T>::value)
: Strategy(other),
m_exitFunction(std::move(other.m_exitFunction)),
m_execute_on_destruction(other.m_execute_on_destruction)
{
other.release();
}

template<class T = EF,
std::enable_if_t<!std::is_nothrow_move_constructible<T>::value, int> = 0
>
scope_guard_base(scope_guard_base&& other) noexcept(std::is_nothrow_move_constructible<T>::value
|| std::is_nothrow_copy_constructible<T>::value)
scope_guard_base(scope_guard_base&& other) noexcept(std::is_nothrow_move_constructible<EF>::value
|| std::is_nothrow_copy_constructible<EF>::value)
: Strategy(other),
m_exitFunction(other.m_exitFunction),
m_exitFunction(std::move_if_noexcept(other.m_exitFunction)),
m_execute_on_destruction(other.m_execute_on_destruction)
{
other.release();

Cargando…
Cancelar
Guardar