procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve base::optional, add emplace().

This commit is contained in:
John Preston 2018-06-05 21:46:05 +03:00
parent d16cbbf279
commit d03d699331
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Telegram/SourceFiles/base/optional.h
View File

@ -87,6 +87,15 @@ public:
return _impl >= other._impl; return _impl >= other._impl;
} }
template <typename T, typename... Args>
T &set(Args &&...args) {
_impl.set<T>(std::forward<Args>(args)...);
return get_unchecked<T>();
}
void clear() {
_impl.set<none_type>();
}
template <typename T> template <typename T>
decltype(auto) is() const { decltype(auto) is() const {
return _impl.template is<T>(); return _impl.template is<T>();
@ -146,28 +155,34 @@ using optional_chain_result_t = typename optional_chain_result<Type>::type;
template <typename Type> template <typename Type>
class optional : public optional_variant<Type> { class optional : public optional_variant<Type> {
using parent = optional_variant<Type>;
public: public:
using optional_variant<Type>::optional_variant; using parent::parent;
Type &operator*() { Type &operator*() {
auto result = get_if<Type>(this); Expects(parent::template is<Type>());
Expects(result != nullptr);
return *result; return parent::template get_unchecked<Type>();
} }
const Type &operator*() const { const Type &operator*() const {
auto result = get_if<Type>(this); Expects(parent::template is<Type>());
Expects(result != nullptr);
return *result; return parent::template get_unchecked<Type>();
} }
Type *operator->() { Type *operator->() {
auto result = get_if<Type>(this); Expects(parent::template is<Type>());
Expects(result != nullptr);
return result; return std::addressof(parent::template get_unchecked<Type>());
} }
const Type *operator->() const { const Type *operator->() const {
auto result = get_if<Type>(this); Expects(parent::template is<Type>());
Expects(result != nullptr);
return result; return std::addressof(parent::template get_unchecked<Type>());
}
template <typename ...Args>
Type &emplace(Args &&...args) {
return parent::template set<Type>(std::forward<Args>(args)...);
} }
}; };