From: Steve Naroff Date: Fri, 23 May 2008 20:57:38 +0000 (+0000) Subject: Remove a diagnostic (temporary hack that will be removed next week). X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9547f5938b88934e0242e4cc7194433d187cb967;p=clang Remove a diagnostic (temporary hack that will be removed next week). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51498 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 38dbb9b09a..f8153289b2 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -258,8 +258,10 @@ 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; ... - Diag(New->getLocation(), diag::err_redefinition, New->getName()); - Diag(Old->getLocation(), diag::err_previous_definition); + // 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); return New; }