Author: Simon Pilgrim Date: 2019-11-21T12:08:00Z New Revision: 013f4ba9c21f91accc516e5a70c70efc69d92b69
URL: https://github.com/llvm/llvm-project/commit/013f4ba9c21f91accc516e5a70c70efc69d92b69 DIFF: https://github.com/llvm/llvm-project/commit/013f4ba9c21f91accc516e5a70c70efc69d92b69.diff LOG: Fix Wshadow warning against global None variable. NFC. Added: Modified: clang/include/clang/AST/DeclTemplate.h Removed: ################################################################################ diff --git a/clang/include/clang/AST/DeclTemplate.h b/clang/include/clang/AST/DeclTemplate.h index ec14adc7de97..3bebba5b9c14 100644 --- 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. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits