diff options
Diffstat (limited to 'third_party/chromium/base/move.h')
| -rw-r--r-- | third_party/chromium/base/move.h | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/third_party/chromium/base/move.h b/third_party/chromium/base/move.h index 24bf9d7..42242b4 100644 --- a/third_party/chromium/base/move.h +++ b/third_party/chromium/base/move.h @@ -5,6 +5,7 @@ #ifndef BASE_MOVE_H_ #define BASE_MOVE_H_ +// TODO(dcheng): Remove this header. #include <utility> #include "base/compiler_specific.h" @@ -25,13 +26,11 @@ // into a scoped_ptr. The class must define a move constructor and move // assignment operator to make this work. // -// This version of the macro adds a Pass() function and a cryptic -// MoveOnlyTypeForCPP03 typedef for the base::Callback implementation to use. -// See IsMoveOnlyType template and its usage in base/callback_internal.h -// for more details. +// This version of the macro adds a cryptic MoveOnlyTypeForCPP03 typedef for the +// base::Callback implementation to use. See IsMoveOnlyType template and its +// usage in base/callback_internal.h for more details. // TODO(crbug.com/566182): Remove this macro and use DISALLOW_COPY_AND_ASSIGN // everywhere instead. -#if defined(OS_ANDROID) || defined(OS_LINUX) #define DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(type) \ private: \ type(const type&) = delete; \ @@ -41,17 +40,5 @@ typedef void MoveOnlyTypeForCPP03; \ \ private: -#else -#define DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(type) \ - private: \ - type(const type&) = delete; \ - void operator=(const type&) = delete; \ - \ - public: \ - type&& Pass() WARN_UNUSED_RESULT { return std::move(*this); } \ - typedef void MoveOnlyTypeForCPP03; \ - \ - private: -#endif #endif // BASE_MOVE_H_ |