| Index: minidump/minidump_module_writer.cc
|
| diff --git a/minidump/minidump_module_writer.cc b/minidump/minidump_module_writer.cc
|
| index fd78b9f8fca5c1534539e99773311b42e60d44a8..8cbf855f92ebf510a35a405ebc11c05d83febfd7 100644
|
| --- a/minidump/minidump_module_writer.cc
|
| +++ b/minidump/minidump_module_writer.cc
|
| @@ -25,6 +25,7 @@
|
| #include "snapshot/module_snapshot.h"
|
| #include "util/file/file_writer.h"
|
| #include "util/misc/implicit_cast.h"
|
| +#include "util/stdlib/move.h"
|
| #include "util/numeric/in_range_cast.h"
|
| #include "util/numeric/safe_assignment.h"
|
|
|
| @@ -244,7 +245,7 @@ void MinidumpModuleWriter::InitializeFromSnapshot(
|
| auto codeview_record =
|
| make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB70Writer());
|
| codeview_record->InitializeFromSnapshot(module_snapshot);
|
| - SetCodeViewRecord(codeview_record.Pass());
|
| + SetCodeViewRecord(crashpad::move(codeview_record));
|
| }
|
|
|
| const MINIDUMP_MODULE* MinidumpModuleWriter::MinidumpModule() const {
|
| @@ -266,14 +267,14 @@ void MinidumpModuleWriter::SetCodeViewRecord(
|
| scoped_ptr<MinidumpModuleCodeViewRecordWriter> codeview_record) {
|
| DCHECK_EQ(state(), kStateMutable);
|
|
|
| - codeview_record_ = codeview_record.Pass();
|
| + codeview_record_ = crashpad::move(codeview_record);
|
| }
|
|
|
| void MinidumpModuleWriter::SetMiscDebugRecord(
|
| scoped_ptr<MinidumpModuleMiscDebugRecordWriter> misc_debug_record) {
|
| DCHECK_EQ(state(), kStateMutable);
|
|
|
| - misc_debug_record_ = misc_debug_record.Pass();
|
| + misc_debug_record_ = crashpad::move(misc_debug_record);
|
| }
|
|
|
| void MinidumpModuleWriter::SetTimestamp(time_t timestamp) {
|
| @@ -385,7 +386,7 @@ void MinidumpModuleListWriter::InitializeFromSnapshot(
|
| for (const ModuleSnapshot* module_snapshot : module_snapshots) {
|
| auto module = make_scoped_ptr(new MinidumpModuleWriter());
|
| module->InitializeFromSnapshot(module_snapshot);
|
| - AddModule(module.Pass());
|
| + AddModule(crashpad::move(module));
|
| }
|
| }
|
|
|
|
|