| Index: dbus/file_descriptor.h
|
| diff --git a/dbus/file_descriptor.h b/dbus/file_descriptor.h
|
| index 8a4109789ecc48df5f4c334e53ee04d9208a5b63..41f7b4e8650ea051a1b3ed57c11bc58c43d183bd 100644
|
| --- a/dbus/file_descriptor.h
|
| +++ b/dbus/file_descriptor.h
|
| @@ -34,7 +34,7 @@ namespace dbus {
|
| // also allows the caller to do this work on the File thread to conform
|
| // with i/o restrictions.
|
| class CHROME_DBUS_EXPORT FileDescriptor {
|
| - MOVE_ONLY_TYPE_FOR_CPP_03(FileDescriptor, RValue);
|
| + MOVE_ONLY_TYPE_FOR_CPP_03(FileDescriptor);
|
|
|
| public:
|
| // This provides a simple way to pass around file descriptors since they must
|
| @@ -49,13 +49,11 @@ class CHROME_DBUS_EXPORT FileDescriptor {
|
| explicit FileDescriptor(int value) : value_(value), owner_(false),
|
| valid_(false) {}
|
|
|
| - // Move constructor for C++03 move emulation of this type.
|
| - FileDescriptor(RValue other);
|
| + FileDescriptor(FileDescriptor&& other);
|
|
|
| virtual ~FileDescriptor();
|
|
|
| - // Move operator= for C++03 move emulation of this type.
|
| - FileDescriptor& operator=(RValue other);
|
| + FileDescriptor& operator=(FileDescriptor&& other);
|
|
|
| // Retrieves value as an int without affecting ownership.
|
| int value() const;
|
|
|