Index: third_party/base/nonstd_unique_ptr.h |
diff --git a/third_party/base/nonstd_unique_ptr.h b/third_party/base/nonstd_unique_ptr.h |
index f519b345b10b151726f6add20374a6df0e017450..f056e5039735a509b2b5fe110fd4fd0b4721b1fd 100644 |
--- a/third_party/base/nonstd_unique_ptr.h |
+++ b/third_party/base/nonstd_unique_ptr.h |
@@ -74,18 +74,12 @@ |
#include <stdlib.h> |
#include <ostream> |
+#include <utility> |
#include "template_util.h" |
namespace nonstd { |
-// Replacement for move, but doesn't allow things that are already |
-// rvalue references. |
-template <class T> |
-T&& move(T& t) { |
- return static_cast<T&&>(t); |
-} |
- |
// Function object which deletes its parameter, which must be a pointer. |
// If C is an array type, invokes 'delete[]' on the parameter; otherwise, |
// invokes 'delete'. The default deleter for unique_ptr<T>. |
@@ -244,7 +238,7 @@ class unique_ptr : public internal::unique_ptr_base<C, D> { |
// Move constructor. |
unique_ptr(unique_ptr&& that) |
- : internal::unique_ptr_base<C, D>(nonstd::move(that)) {} |
+ : internal::unique_ptr_base<C, D>(std::move(that)) {} |
// operator=. Allows assignment from a nullptr. Deletes the currently owned |
// object, if any. |
@@ -317,7 +311,7 @@ class unique_ptr<C[], D> : public internal::unique_ptr_base<C, D> { |
// Move constructor. |
unique_ptr(unique_ptr&& that) |
- : internal::unique_ptr_base<C, D>(nonstd::move(that)) {} |
+ : internal::unique_ptr_base<C, D>(std::move(that)) {} |
// operator=. Allows assignment from a nullptr. Deletes the currently owned |
// array, if any. |