diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-01-12 20:34:32 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-01-12 20:34:32 +0000 |
| commit | 2de44e658d62f1032111933a5b751f17fc477c55 (patch) | |
| tree | 55daa1a3c6498b6684ff61f4f31908f745f766b7 /clang/lib/Sema | |
| parent | 3469ee120c753c60875ddc301ea7921700b8730a (diff) | |
| download | bcm5719-llvm-2de44e658d62f1032111933a5b751f17fc477c55.tar.gz bcm5719-llvm-2de44e658d62f1032111933a5b751f17fc477c55.zip | |
[modules] Don't diagnose a conflict between two using-declarations that name equivalent internal linkage entities.
llvm-svn: 257512
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 4b03baf32ac..11f232934e5 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -7797,6 +7797,10 @@ bool Sema::CheckUsingShadowDecl(UsingDecl *Using, NamedDecl *Orig, if (UsingShadowDecl *Shadow = dyn_cast<UsingShadowDecl>(*I)) PrevShadow = Shadow; FoundEquivalentDecl = true; + } else if (isEquivalentInternalLinkageDeclaration(D, Target)) { + // We don't conflict with an existing using shadow decl of an equivalent + // declaration, but we're not a redeclaration of it. + FoundEquivalentDecl = true; } if (isVisible(D)) |
