summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-01-11 22:30:10 +0000
committerDouglas Gregor <dgregor@apple.com>2010-01-11 22:30:10 +0000
commitd615026e8dcdd77e81bbfeadcf2f9c2e87dfe8f2 (patch)
treedb930b1800f0517c003fa4928fbea138016dd009 /clang/lib
parentb53e826103cf7adbde88aa4f9f3c0aa3c0f8293b (diff)
downloadbcm5719-llvm-d615026e8dcdd77e81bbfeadcf2f9c2e87dfe8f2.tar.gz
bcm5719-llvm-d615026e8dcdd77e81bbfeadcf2f9c2e87dfe8f2.zip
C++0x [dcl.typedef]p4, take 3, where we actually figure out what "that
is not also a typedef-name" actually means. For anyone keeping score, that's John: 2, Doug: 0. llvm-svn: 93196
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaDecl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index dc91431cdd7..d2f254c7184 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -832,7 +832,7 @@ void Sema::MergeTypeDefDecl(TypedefDecl *New, LookupResult &OldDecls) {
// };
//
// since that was the intent of DR56.
- if (isa<ElaboratedType>(New->getUnderlyingType()))
+ if (!isa<TypedefDecl >(Old))
return;
Diag(New->getLocation(), diag::err_redefinition)
OpenPOWER on IntegriCloud