diff options
| author | Ted Kremenek <kremenek@apple.com> | 2008-05-23 21:28:18 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2008-05-23 21:28:18 +0000 |
| commit | 2d05c088407596c0ddefd023c89ba872220724e2 (patch) | |
| tree | 3bc0b9866e38fc4e5b158c00bc426711c79b359f | |
| parent | 9547f5938b88934e0242e4cc7194433d187cb967 (diff) | |
Revert r51498: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=51498&r1=51497&r2=51498&view=diff
Turns out that there are multiple places where a redefinition diagnostic can be emitted. A cleaner solution (without touching Sema) is to have
the Driver turn off these diagnostics. (will submit this patch soon)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51502 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index f8153289b2..38dbb9b09a 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -258,10 +258,8 @@ TypedefDecl *Sema::MergeTypeDefDecl(TypedefDecl *New, Decl *OldD) { // TODO: CHECK FOR CONFLICTS, multiple decls with same name in one scope. // TODO: This is totally simplistic. It should handle merging functions // together etc, merging extern int X; int X; ... - // FIXME: temporarily removing this diagnostic (5/23/08). Will put back - // next week (which the .i file FIXME above is nailed). - //Diag(New->getLocation(), diag::err_redefinition, New->getName()); - //Diag(Old->getLocation(), diag::err_previous_definition); + Diag(New->getLocation(), diag::err_redefinition, New->getName()); + Diag(Old->getLocation(), diag::err_previous_definition); return New; } |