Remove a diagnostic (temporary hack that will be removed next week).

llvm-svn: 51498
This commit is contained in:
Steve Naroff 2008-05-23 20:57:38 +00:00
parent 37f5b7d39c
commit c11802a521
1 changed files with 4 additions and 2 deletions

View File

@ -258,8 +258,10 @@ TypedefDecl *Sema::MergeTypeDefDecl(TypedefDecl *New, Decl *OldD) {
// TODO: CHECK FOR CONFLICTS, multiple decls with same name in one scope. // TODO: CHECK FOR CONFLICTS, multiple decls with same name in one scope.
// TODO: This is totally simplistic. It should handle merging functions // TODO: This is totally simplistic. It should handle merging functions
// together etc, merging extern int X; int X; ... // together etc, merging extern int X; int X; ...
Diag(New->getLocation(), diag::err_redefinition, New->getName()); // FIXME: temporarily removing this diagnostic (5/23/08). Will put back
Diag(Old->getLocation(), diag::err_previous_definition); // 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; return New;
} }