diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/util.h | 26 |
1 files changed, 14 insertions, 12 deletions
@@ -74,18 +74,20 @@ namespace QMatrixClient template <typename T> class Omittable { + static_assert(!std::is_reference<T>::value, + "You cannot make an Omittable<> with a reference type"); public: explicit Omittable() : Omittable(none) { } - Omittable(NoneTag) : _omitted(true) { } - Omittable(const T& val) : _value(val) { } - Omittable(T&& val) : _value(std::move(val)) { } - Omittable<T>& operator=(const T& val) + Omittable(NoneTag) : _value(std::decay_t<T>{}), _omitted(true) { } + Omittable(const std::decay_t<T>& val) : _value(val) { } + Omittable(std::decay_t<T>&& val) : _value(std::move(val)) { } + Omittable<T>& operator=(const std::decay_t<T>& val) { _value = val; _omitted = false; return *this; } - Omittable<T>& operator=(T&& val) + Omittable<T>& operator=(std::decay_t<T>&& val) { _value = std::move(val); _omitted = false; @@ -93,15 +95,15 @@ namespace QMatrixClient } bool omitted() const { return _omitted; } - const T& value() const { return _value; } - T& value() { return _value; } - T&& release() { _omitted = true; return std::move(_value); } + const std::decay_t<T>& value() const { Q_ASSERT(!_omitted); return _value; } + std::decay_t<T>& value() { Q_ASSERT(!_omitted); return _value; } + std::decay_t<T>&& release() { _omitted = true; return std::move(_value); } operator bool() const { return !omitted(); } - const T& operator->() const { return &_value; } - T& operator->() { return &_value; } - const T& operator*() const { return _value; } - T& operator*() { return _value; } + const std::decay<T>* operator->() const { return &value(); } + std::decay_t<T>* operator->() { return &value(); } + const std::decay_t<T>& operator*() const { return value(); } + std::decay_t<T>& operator*() { return value(); } private: T _value; |