diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-10-20 17:58:49 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-10-20 17:58:49 +0000 |
| commit | f4ef4d2ec5394c5d0967489b9ebdc033f00be321 (patch) | |
| tree | dcf59ced6ee7b3137452699746d0e340dd136942 /clang/lib/Sema/SemaDecl.cpp | |
| parent | 5a328cc8c6e7b30f7fb9e2bbdc5c5a1311ef3899 (diff) | |
| download | bcm5719-llvm-f4ef4d2ec5394c5d0967489b9ebdc033f00be321.tar.gz bcm5719-llvm-f4ef4d2ec5394c5d0967489b9ebdc033f00be321.zip | |
There's no point in marking a declaration invalid just because it
shadows a template parameter. Complain about the shadowing (or not,
under -fms-extensions), but don't invalidate the declaration. Merely
forget about the template parameter declaration.
llvm-svn: 142596
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index bccb63eede6..eff21cb12bb 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -3347,9 +3347,8 @@ Decl *Sema::HandleDeclarator(Scope *S, Declarator &D, Previous.getFoundDecl()->isTemplateParameter()) { // Maybe we will complain about the shadowed template parameter. if (!D.isInvalidType()) - if (DiagnoseTemplateParameterShadow(D.getIdentifierLoc(), - Previous.getFoundDecl())) - D.setInvalidType(); + DiagnoseTemplateParameterShadow(D.getIdentifierLoc(), + Previous.getFoundDecl()); // Just pretend that we didn't see the previous declaration. Previous.clear(); |
