Fix Wshadow warning against global None variable. NFC.

RKSimon · RKSimon · commit 013f4ba9c21f · 2019-11-21T12:08:00.000Z
diff --git a/clang/include/clang/AST/DeclTemplate.h b/clang/include/clang/AST/DeclTemplate.h
@@ -1557,8 +1557,8 @@ class TemplateTemplateParmDecl final
 
   /// Retrieve the default argument, if any.
   const TemplateArgumentLoc &getDefaultArgument() const {
-    static const TemplateArgumentLoc None;
-    return DefaultArgument.isSet() ? *DefaultArgument.get() : None;
+    static const TemplateArgumentLoc NoneLoc;
+    return DefaultArgument.isSet() ? *DefaultArgument.get() : NoneLoc;
   }
 
   /// Retrieve the location of the default argument, if any.

Original file line number	Diff line number	Diff line change
`@@ -1557,8 +1557,8 @@ class TemplateTemplateParmDecl final`
`1557`	`1557`
`1558`	`1558`	`/// Retrieve the default argument, if any.`
`1559`	`1559`	`const TemplateArgumentLoc &getDefaultArgument() const {`
`1560`		`- static const TemplateArgumentLoc None;`
`1561`		`- return DefaultArgument.isSet() ? *DefaultArgument.get() : None;`
	`1560`	`+ static const TemplateArgumentLoc NoneLoc;`
	`1561`	`+ return DefaultArgument.isSet() ? *DefaultArgument.get() : NoneLoc;`
`1562`	`1562`	`}`
`1563`	`1563`
`1564`	`1564`	`/// Retrieve the location of the default argument, if any.`