diff options
author | dcheng <dcheng@chromium.org> | 2015-12-01 04:09:52 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 12:10:42 +0000 |
commit | e1b0277c20198c31b8782f567634552243182d08 (patch) | |
tree | 75fde33e5410051ddff4de64bbdd9766d294ef25 /storage | |
parent | 7f54a6c611e793e47712cd4a988a46b5fbbdfd07 (diff) | |
download | chromium_src-e1b0277c20198c31b8782f567634552243182d08.zip chromium_src-e1b0277c20198c31b8782f567634552243182d08.tar.gz chromium_src-e1b0277c20198c31b8782f567634552243182d08.tar.bz2 |
Remove old C++03 move emulation code.
Chrome allows the use of C++11 features now, so just use rvalue
references directly.
BUG=543901
Review URL: https://codereview.chromium.org/1407443002
Cr-Commit-Position: refs/heads/master@{#362394}
Diffstat (limited to 'storage')
-rw-r--r-- | storage/browser/blob/scoped_file.cc | 4 | ||||
-rw-r--r-- | storage/browser/blob/scoped_file.h | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/storage/browser/blob/scoped_file.cc b/storage/browser/blob/scoped_file.cc index 825dc04..b57e882 100644 --- a/storage/browser/blob/scoped_file.cc +++ b/storage/browser/blob/scoped_file.cc @@ -29,8 +29,8 @@ ScopedFile::ScopedFile(const base::FilePath& path, << " runner:" << file_task_runner.get(); } -ScopedFile::ScopedFile(RValue other) { - MoveFrom(*other.object); +ScopedFile::ScopedFile(ScopedFile&& other) { + MoveFrom(other); } ScopedFile::~ScopedFile() { diff --git a/storage/browser/blob/scoped_file.h b/storage/browser/blob/scoped_file.h index a8fd730..583ce78 100644 --- a/storage/browser/blob/scoped_file.h +++ b/storage/browser/blob/scoped_file.h @@ -27,10 +27,7 @@ namespace storage { // TODO(kinuko): Probably this can be moved under base or somewhere more // common place. class STORAGE_EXPORT ScopedFile { - // To support destructive assignment from an l-value assignment. - // This provides Pass() method which creates an r-value for the current - // instance. (See base/move.h for details) - MOVE_ONLY_TYPE_FOR_CPP_03(ScopedFile, RValue) + MOVE_ONLY_TYPE_FOR_CPP_03(ScopedFile) public: typedef base::Callback<void(const base::FilePath&)> ScopeOutCallback; @@ -53,9 +50,9 @@ class STORAGE_EXPORT ScopedFile { // Move constructor and operator. The data of r-value will be transfered // in a destructive way. (See base/move.h) - ScopedFile(RValue other); - ScopedFile& operator=(RValue rhs) { - MoveFrom(*rhs.object); + ScopedFile(ScopedFile&& other); + ScopedFile& operator=(ScopedFile&& rhs) { + MoveFrom(rhs); return *this; } |