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

Unified Diff: net/base/file_stream_context.cc

Issue 1407443002: Remove old C++03 move emulation code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 2 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
Index: net/base/file_stream_context.cc
diff --git a/net/base/file_stream_context.cc b/net/base/file_stream_context.cc
index 3ddf4bbf508ea596c6be81c0eb6b4e70a807149f..04c0150b3b33d56219ae54dff94258fcc131d17f 100644
--- a/net/base/file_stream_context.cc
+++ b/net/base/file_stream_context.cc
@@ -54,17 +54,14 @@ FileStream::Context::OpenResult::OpenResult(base::File file,
error_code(error_code) {
}
-FileStream::Context::OpenResult::OpenResult(RValue other)
- : file(other.object->file.Pass()),
- error_code(other.object->error_code) {
-}
+FileStream::Context::OpenResult::OpenResult(OpenResult&& other)
+ : file(other.file.Pass()), error_code(other.error_code) {}
FileStream::Context::OpenResult& FileStream::Context::OpenResult::operator=(
- RValue other) {
- if (this != other.object) {
- file = other.object->file.Pass();
- error_code = other.object->error_code;
- }
+ OpenResult&& other) {
+ DCHECK_NE(this, &other);
danakj 2015/10/15 23:35:06 also not destructive, remove?
dcheng 2015/10/16 00:40:01 See above.
dcheng 2015/10/19 21:29:50 Done.
+ file = other.file.Pass();
+ error_code = other.error_code;
return *this;
}

Powered by Google App Engine
This is Rietveld 408576698