Make take always move

Fixes #23

Author: TartanLlama

tl/optional.hpp

@@ -1032,32 +1032,12 @@ class optional : private detail::optional_move_assign_base<T>,
 #endif
 
   /// Takes the value out of the optional, leaving it empty
-  optional take() & {
-    optional ret = *this;
-    reset();
-    return ret;
-  }
-
-  optional take() const & {
-    optional ret = *this;
-    reset();
-    return ret;
-  }
-
-  optional take() && {
+  optional take() {
     optional ret = std::move(*this);
     reset();
     return ret;
   }
 
-#ifndef TL_OPTIONAL_NO_CONSTRR
-  optional take() const && {
-    optional ret = std::move(*this);
-    reset();
-    return ret;
-  }
-#endif
-
   using value_type = T;
 
   /// Constructs an optional that does not contain a value.
@@ -1926,32 +1906,12 @@ template <class T> class optional<T &> {
 #endif
 
   /// Takes the value out of the optional, leaving it empty
-  optional take() & {
-    optional ret = *this;
-    reset();
-    return ret;
-  }
-
-  optional take() const & {
-    optional ret = *this;
-    reset();
-    return ret;
-  }
-
-  optional take() && {
+  optional take() {
     optional ret = std::move(*this);
     reset();
     return ret;
   }
 
-#ifndef TL_OPTIONAL_NO_CONSTRR
-  optional take() const && {
-    optional ret = std::move(*this);
-    reset();
-    return ret;
-  }
-#endif
-
   using value_type = T &;
 
   /// Constructs an optional that does not contain a value.