| Index: mojo/public/cpp/bindings/associated_interface_ptr_info.h
|
| diff --git a/mojo/public/cpp/bindings/associated_interface_ptr_info.h b/mojo/public/cpp/bindings/associated_interface_ptr_info.h
|
| index 1bbe1d21edc3d98e0a86d28d98f8f0b080507692..35e4eb1462b89654318475fafee4afc3b8cd9458 100644
|
| --- a/mojo/public/cpp/bindings/associated_interface_ptr_info.h
|
| +++ b/mojo/public/cpp/bindings/associated_interface_ptr_info.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_
|
| #define MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_
|
|
|
| +#include <utility>
|
| +
|
| #include "base/macros.h"
|
| #include "mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.h"
|
|
|
| @@ -25,7 +27,7 @@ class AssociatedInterfacePtrInfo {
|
| AssociatedInterfacePtrInfo() : version_(0u) {}
|
|
|
| AssociatedInterfacePtrInfo(AssociatedInterfacePtrInfo&& other)
|
| - : handle_(other.handle_.Pass()), version_(other.version_) {
|
| + : handle_(std::move(other.handle_)), version_(other.version_) {
|
| other.version_ = 0u;
|
| }
|
|
|
| @@ -33,7 +35,7 @@ class AssociatedInterfacePtrInfo {
|
|
|
| AssociatedInterfacePtrInfo& operator=(AssociatedInterfacePtrInfo&& other) {
|
| if (this != &other) {
|
| - handle_ = other.handle_.Pass();
|
| + handle_ = std::move(other.handle_);
|
| version_ = other.version_;
|
| other.version_ = 0u;
|
| }
|
| @@ -63,7 +65,7 @@ class AssociatedInterfacePtrInfoHelper {
|
| template <typename Interface>
|
| static ScopedInterfaceEndpointHandle PassHandle(
|
| AssociatedInterfacePtrInfo<Interface>* info) {
|
| - return info->handle_.Pass();
|
| + return std::move(info->handle_);
|
| }
|
|
|
| template <typename Interface>
|
| @@ -75,7 +77,7 @@ class AssociatedInterfacePtrInfoHelper {
|
| template <typename Interface>
|
| static void SetHandle(AssociatedInterfacePtrInfo<Interface>* info,
|
| ScopedInterfaceEndpointHandle handle) {
|
| - info->handle_ = handle.Pass();
|
| + info->handle_ = std::move(handle);
|
| }
|
| };
|
|
|
|
|