diff options
| author | John McCall <rjmccall@apple.com> | 2010-11-29 18:01:58 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-11-29 18:01:58 +0000 |
| commit | 032092ffc23a62549fd1bd9eb2d3dbd2247d13f9 (patch) | |
| tree | 8c83cc09d8ea048f3c91ae812128dc96c7304b50 /clang/lib/Sema | |
| parent | bbda8ed39a326343f75f135fab0103dd2f36fc69 (diff) | |
| download | bcm5719-llvm-032092ffc23a62549fd1bd9eb2d3dbd2247d13f9.tar.gz bcm5719-llvm-032092ffc23a62549fd1bd9eb2d3dbd2247d13f9.zip | |
Revert r120063, it was wrong.
llvm-svn: 120296
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 648e654fd7d..d30faccf24a 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -3961,8 +3961,8 @@ bool Sema::CheckUsingDeclRedeclaration(SourceLocation UsingLoc, // repeatedly where (and only where) multiple declarations are // allowed. // - // That's in file contexts. - if (CurContext->isFileContext()) + // That's in non-member contexts. + if (!CurContext->getRedeclContext()->isRecord()) return false; NestedNameSpecifier *Qual |
