Skip to content

Commit

Permalink
Remove implicit conversion from scoped_refptr to T* in tools/gn
Browse files Browse the repository at this point in the history
This patch was generated by running the rewrite_scoped_refptr clang tool
on a ChromeOS build.

BUG=110610

Review URL: https://codereview.chromium.org/555163004

Cr-Commit-Position: refs/heads/master@{#294632}
  • Loading branch information
zetafunction authored and Commit bot committed Sep 12, 2014
1 parent 4b2da4c commit b66e11d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/gn/scope.cc
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ bool Scope::NonRecursiveMergeTo(Scope* dest,
const Template* existing_template = dest->GetTemplate(i->first);
// Since templates are refcounted, we can check if it's the same one by
// comparing pointers.
if (existing_template && i->second != existing_template) {
if (existing_template && i->second.get() != existing_template) {
// Rule present in both the source and the dest, and they're not the
// same one.
std::string desc_string(desc_for_err);
Expand Down

0 comments on commit b66e11d

Please sign in to comment.