| Index: minidump/minidump_module_crashpad_info_writer.cc
|
| diff --git a/minidump/minidump_module_crashpad_info_writer.cc b/minidump/minidump_module_crashpad_info_writer.cc
|
| index 8868badbd8a1e889ad240543f914fa5a101e943a..5b71ec2c853f4090274e32c78f19e39c7b3ef586 100644
|
| --- a/minidump/minidump_module_crashpad_info_writer.cc
|
| +++ b/minidump/minidump_module_crashpad_info_writer.cc
|
| @@ -20,6 +20,7 @@
|
| #include "minidump/minidump_simple_string_dictionary_writer.h"
|
| #include "snapshot/module_snapshot.h"
|
| #include "util/file/file_writer.h"
|
| +#include "util/stdlib/move.h"
|
| #include "util/numeric/safe_assignment.h"
|
|
|
| namespace crashpad {
|
| @@ -44,7 +45,7 @@ void MinidumpModuleCrashpadInfoWriter::InitializeFromSnapshot(
|
| auto list_annotations = make_scoped_ptr(new MinidumpUTF8StringListWriter());
|
| list_annotations->InitializeFromVector(module_snapshot->AnnotationsVector());
|
| if (list_annotations->IsUseful()) {
|
| - SetListAnnotations(list_annotations.Pass());
|
| + SetListAnnotations(crashpad::move(list_annotations));
|
| }
|
|
|
| auto simple_annotations =
|
| @@ -52,7 +53,7 @@ void MinidumpModuleCrashpadInfoWriter::InitializeFromSnapshot(
|
| simple_annotations->InitializeFromMap(
|
| module_snapshot->AnnotationsSimpleMap());
|
| if (simple_annotations->IsUseful()) {
|
| - SetSimpleAnnotations(simple_annotations.Pass());
|
| + SetSimpleAnnotations(crashpad::move(simple_annotations));
|
| }
|
| }
|
|
|
| @@ -60,14 +61,14 @@ void MinidumpModuleCrashpadInfoWriter::SetListAnnotations(
|
| scoped_ptr<MinidumpUTF8StringListWriter> list_annotations) {
|
| DCHECK_EQ(state(), kStateMutable);
|
|
|
| - list_annotations_ = list_annotations.Pass();
|
| + list_annotations_ = crashpad::move(list_annotations);
|
| }
|
|
|
| void MinidumpModuleCrashpadInfoWriter::SetSimpleAnnotations(
|
| scoped_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations) {
|
| DCHECK_EQ(state(), kStateMutable);
|
|
|
| - simple_annotations_ = simple_annotations.Pass();
|
| + simple_annotations_ = crashpad::move(simple_annotations);
|
| }
|
|
|
| bool MinidumpModuleCrashpadInfoWriter::IsUseful() const {
|
| @@ -144,7 +145,7 @@ void MinidumpModuleCrashpadInfoListWriter::InitializeFromSnapshot(
|
| auto module = make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
|
| module->InitializeFromSnapshot(module_snapshot);
|
| if (module->IsUseful()) {
|
| - AddModule(module.Pass(), index);
|
| + AddModule(crashpad::move(module), index);
|
| }
|
| }
|
| }
|
|
|