Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Unified Diff: dbus/file_descriptor.cc

Issue 1170283005: Make dbus::FileDescriptor a Pass()-movable type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dbus/file_descriptor.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/file_descriptor.cc
diff --git a/dbus/file_descriptor.cc b/dbus/file_descriptor.cc
index e607fc01356d8ca284f0ea1732150a0a43a3bf69..472f5718f0041d44ef9039972346aaa7558e11c6 100644
--- a/dbus/file_descriptor.cc
+++ b/dbus/file_descriptor.cc
@@ -17,11 +17,30 @@ void CHROME_DBUS_EXPORT FileDescriptor::Deleter::operator()(
FROM_HERE, base::Bind(&base::DeletePointer<FileDescriptor>, fd), false);
}
+FileDescriptor::FileDescriptor(RValue other)
+ : value_(other.object->value_),
+ owner_(other.object->owner_),
+ valid_(other.object->valid_) {
+ other.object->value_ = -1;
+ other.object->valid_ = false;
+ other.object->owner_ = false;
+}
+
FileDescriptor::~FileDescriptor() {
if (owner_)
base::File auto_closer(value_);
}
+FileDescriptor& FileDescriptor::operator=(RValue other) {
+ value_ = other.object->value_;
Alex Vakulenko 2015/06/10 18:55:47 I think here you should do just std::swap() on eac
Reilly Grant (use Gerrit) 2015/06/10 19:21:10 Done.
+ owner_ = other.object->owner_;
+ valid_ = other.object->valid_;
+ other.object->value_ = -1;
+ other.object->valid_ = false;
+ other.object->owner_ = false;
+ return *this;
+}
+
int FileDescriptor::value() const {
CHECK(valid_);
return value_;
« no previous file with comments | « dbus/file_descriptor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698