summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2018-11-20 17:15:05 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-11-20 17:15:05 +0000
commit3573c3669b281e0fa6c59019d4e9de5d37e651ea (patch)
tree6d1cbb25f1c0a8500e8735f92be5d1338ae17700
parent27cfa8fc8c11fbf2d5a069cf767faee4f1312765 (diff)
parent41c911f23117fc691fea31f2f6a4b3c9a550762b (diff)
Merge "ART: Fix misc-uniqueptr-reset-release"
-rw-r--r--runtime/class_loader_context.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/class_loader_context.cc b/runtime/class_loader_context.cc
index 7ca6f86fe3..5fffa641c7 100644
--- a/runtime/class_loader_context.cc
+++ b/runtime/class_loader_context.cc
@@ -351,11 +351,11 @@ ClassLoaderContext::ClassLoaderInfo* ClassLoaderContext::ParseInternal(
return nullptr;
}
if (first == nullptr) {
- first.reset(info.release());
+ first = std::move(info);
previous_iteration = first.get();
} else {
CHECK(previous_iteration != nullptr);
- previous_iteration->parent.reset(info.release());
+ previous_iteration->parent = std::move(info);
previous_iteration = previous_iteration->parent.get();
}
}