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 | 8a72621a019a0b3ae793b1f5fc6da2243476979f (patch) | |
| tree | 1e556332b85903b0f2d22fbc8e5b1c158cfe2925 /lib/Sema/SemaDeclCXX.cpp | |
| parent | 2a601eb4cd9190ed52cc1c990c5a8c5ee852bce6 (diff) | |
Revert r120063, it was wrong.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@120296 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDeclCXX.cpp')
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 648e654fd7..d30faccf24 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/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 |