summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorSimon Pilgrim <llvm-dev@redking.me.uk>2019-11-21 11:54:35 +0000
committerSimon Pilgrim <llvm-dev@redking.me.uk>2019-11-21 12:08:00 +0000
commit013f4ba9c21f91accc516e5a70c70efc69d92b69 (patch)
tree7b5bc946f8cb83f0b7def6d3d4984f6f8d587db4 /clang
parentffc4ff868fcca29080dcc90e223b582c4ccfc574 (diff)
downloadbcm5719-llvm-013f4ba9c21f91accc516e5a70c70efc69d92b69.tar.gz
bcm5719-llvm-013f4ba9c21f91accc516e5a70c70efc69d92b69.zip
Fix Wshadow warning against global None variable. NFC.
Diffstat (limited to 'clang')
-rw-r--r--clang/include/clang/AST/DeclTemplate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/AST/DeclTemplate.h b/clang/include/clang/AST/DeclTemplate.h
index ec14adc7de9..3bebba5b9c1 100644
--- a/clang/include/clang/AST/DeclTemplate.h
+++ b/clang/include/clang/AST/DeclTemplate.h
@@ -1557,8 +1557,8 @@ public:
/// 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.
OpenPOWER on IntegriCloud