1 files changed, 5 insertions, 10 deletions

diff --git a/lib/util.h b/lib/util.h
index aa44893f..4fdf7aa0 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -77,17 +77,12 @@ namespace QMatrixClient
         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)
+            template <typename TT>
+            Omittable(TT&& val) : _value(std::forward<TT>(val)) { }
+            template <typename TT>
+            Omittable<T>& operator=(TT& val)
             {
-                _value = val;
-                _omitted = false;
-                return *this;
-            }
-            Omittable<T>& operator=(T&& val)
-            {
-                _value = std::move(val);
+                _value = std::forward<TT>(val);
                 _omitted = false;
                 return *this;
             }