Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1176)

Unified Diff: tools/gn/scope.cc

Issue 555163004: Remove implicit conversion from scoped_refptr to T* in tools/gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/scope.cc
diff --git a/tools/gn/scope.cc b/tools/gn/scope.cc
index 63b45bc6f01b9c2662ded7504ea768baeca6f7dd..232ed06347e62838a4b4919d9cbf8d4ede97e032 100644
--- a/tools/gn/scope.cc
+++ b/tools/gn/scope.cc
@@ -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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698