From d1bd79770900f3b873f60d7559b97d2fb149eaf9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 11 Mar 2016 11:23:48 +0200 Subject: Add move constructor/assignment to optional --- butl/optional | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/butl/optional b/butl/optional index 00c204a..86bbe59 100644 --- a/butl/optional +++ b/butl/optional @@ -5,6 +5,8 @@ #ifndef BUTL_OPTIONAL #define BUTL_OPTIONAL +#include // move() + namespace butl { // Simple optional class template while waiting for std::optional. @@ -21,9 +23,11 @@ namespace butl optional (): null_ (true) {} optional (nullopt_t): null_ (true) {} optional (const T& v): value_ (v), null_ (false) {} + optional (T&& v): value_ (std::move (v)), null_ (false) {} optional& operator= (nullopt_t) {value_ = T (); null_ = true; return *this;} optional& operator= (const T& v) {value_ = v; null_ = false; return *this;} + optional& operator= (T&& v) {value_ = std::move (v); null_ = false; return *this;} T& value () {return value_;} const T& value () const {return value_;} -- cgit v1.1