kcat
/
openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some unnecessary constructors

master
Chris Robinson 2020-12-27 06:43:59 -08:00
parent 7833cfa8de
commit 4c0f77c13e
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
common/aloptional.h
View File

@ -45,27 +45,11 @@ public:
explicit optional(in_place_t, Args&& ...args) : mHasValue{true}
, mValue{std::forward<Args>(args)...}
{ }
template<typename U, typename... Args, REQUIRES(std::is_constructible<T, std::initializer_list<U>&, Args...>::value)>
explicit optional(in_place_t, std::initializer_list<U> il, Args&& ...args)
: mHasValue{true}, mValue{il, std::forward<Args>(args)...}
{ }
template<typename U=value_type, REQUIRES(std::is_constructible<T, U&&>::value &&
!std::is_same<typename std::decay<U>::type, in_place_t>::value &&
!std::is_same<typename std::decay<U>::type, optional<T>>::value &&
std::is_constructible<U&&, T>::value)>
constexpr explicit optional(U&& value) : mHasValue{true}, mValue{std::forward<U>(value)}
{ }
template<typename U=value_type, REQUIRES(std::is_constructible<T, U&&>::value &&
!std::is_same<typename std::decay<U>::type, in_place_t>::value &&
!std::is_same<typename std::decay<U>::type, optional<T>>::value &&
!std::is_constructible<U&&, T>::value)>
constexpr optional(U&& value) : mHasValue{true}, mValue{std::forward<U>(value)}
{ }
~optional() { if(mHasValue) al::destroy_at(std::addressof(mValue)); }
optional& operator=(nullopt_t) noexcept { reset(); return *this; }
template<REQUIRES(std::is_copy_constructible<T>::value && std::is_copy_assignable<T>::value)>
optional& operator=(const optional &rhs)
std::enable_if_t<std::is_copy_constructible<T>::value && std::is_copy_assignable<T>::value,
optional&> operator=(const optional &rhs)
{
if(!rhs)
reset();
@ -75,8 +59,8 @@ public:
DoConstruct(*rhs);
return *this;
}
template<REQUIRES(std::is_move_constructible<T>::value && std::is_move_assignable<T>::value)>
optional& operator=(optional&& rhs)
std::enable_if_t<std::is_move_constructible<T>::value && std::is_move_assignable<T>::value,
optional&> operator=(optional&& rhs)
{
if(!rhs)
reset();
@ -86,12 +70,13 @@ public:
DoConstruct(std::move(*rhs));
return *this;
}
template<typename U=T, REQUIRES(std::is_constructible<T, U>::value &&
template<typename U=T>
std::enable_if_t<std::is_constructible<T, U>::value &&
std::is_assignable<T&, U>::value &&
!std::is_same<typename std::decay<U>::type, optional<T>>::value &&
(!std::is_same<typename std::decay<U>::type, T>::value ||
!std::is_scalar<U>::value))>
optional& operator=(U&& rhs)
!std::is_scalar<U>::value),
optional&> operator=(U&& rhs)
{
if(*this)
mValue = std::forward<U>(rhs);

6
common/strutils.cpp
View File

@ -46,7 +46,8 @@ namespace al {
al::optional<std::string> getenv(const char *envname)
{
const char *str{std::getenv(envname)};
if(str && str[0] != '\0') return str;
if(str && str[0] != '\0')
return al::make_optional<std::string>(str);
return al::nullopt;
}
@ -54,7 +55,8 @@ al::optional<std::string> getenv(const char *envname)
al::optional<std::wstring> getenv(const WCHAR *envname)
{
const WCHAR *str{_wgetenv(envname)};
if(str && str[0] != L'\0') return str;
if(str && str[0] != L'\0')
return al::make_optional<std::wstring>(str);
return al::nullopt;
}
#endif