[cfe-commits] r39313 - in /cfe/cfe/trunk: AST/SemaDecl.cpp Driver/clang.cpp Parse/ParseDecl.cpp Sema/SemaDecl.cpp

[sabre at cs.uiuc.edu]

Author: sabre
Date: Wed Jul 11 11:42:55 2007
New Revision: 39313

URL: http://llvm.org/viewvc/llvm-project?rev=39313&view=rev
Log:
adjust to change in SmallSet interface

Modified:
    cfe/cfe/trunk/AST/SemaDecl.cpp
    cfe/cfe/trunk/Driver/clang.cpp
    cfe/cfe/trunk/Parse/ParseDecl.cpp
    cfe/cfe/trunk/Sema/SemaDecl.cpp

Modified: cfe/cfe/trunk/AST/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/AST/SemaDecl.cpp?rev=39313&r1=39312&r2=39313&view=diff

==============================================================================
--- cfe/cfe/trunk/AST/SemaDecl.cpp (original)
+++ cfe/cfe/trunk/AST/SemaDecl.cpp Wed Jul 11 11:42:55 2007
@@ -475,7 +475,7 @@
     // Keep track of the number of named members.
     if (IdentifierInfo *II = FD->getIdentifier()) {
       // Detect duplicate member names.
-      if (!FieldIDs.insert(II).second) {
+      if (!FieldIDs.insert(II)) {
         Diag(FD->getLocation(), diag::err_duplicate_member, II->getName());
         // Find the previous decl.
         SourceLocation PrevLoc;
@@ -520,7 +520,6 @@
     }
   }
   
-  
   TypeRef Ty = Context.getTagDeclType(TheEnumDecl);
   EnumConstantDecl *New = new EnumConstantDecl(IdLoc, Id, Ty);
   

Modified: cfe/cfe/trunk/Driver/clang.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Driver/clang.cpp?rev=39313&r1=39312&r2=39313&view=diff

==============================================================================
--- cfe/cfe/trunk/Driver/clang.cpp (original)
+++ cfe/cfe/trunk/Driver/clang.cpp Wed Jul 11 11:42:55 2007
@@ -367,6 +367,7 @@
                                                SourceLocation Pos,
                                                diag::kind ID, 
                                                const std::string &Extra) {
+  return;
   ++NumDiagnostics;
   unsigned LineNo = 0, FilePos = 0, FileID = 0, ColNo = 0;
   unsigned LineStart = 0, LineEnd = 0;

Modified: cfe/cfe/trunk/Parse/ParseDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Parse/ParseDecl.cpp?rev=39313&r1=39312&r2=39313&view=diff

==============================================================================
--- cfe/cfe/trunk/Parse/ParseDecl.cpp (original)
+++ cfe/cfe/trunk/Parse/ParseDecl.cpp Wed Jul 11 11:42:55 2007
@@ -1024,7 +1024,7 @@
       IdentifierInfo *ParmII = Tok.getIdentifierInfo();
       
       // Verify that the argument identifier has not already been mentioned.
-      if (!ParamsSoFar.insert(ParmII).second) {
+      if (!ParamsSoFar.insert(ParmII)) {
         Diag(Tok.getLocation(), diag::err_param_redefinition,ParmII->getName());
         ParmII = 0;
       }
@@ -1103,7 +1103,7 @@
       IdentifierInfo *ParmII = ParmDecl.getIdentifier();
       
       // Verify that the argument identifier has not already been mentioned.
-      if (ParmII && !ParamsSoFar.insert(ParmII).second) {
+      if (ParmII && !ParamsSoFar.insert(ParmII)) {
         Diag(ParmDecl.getIdentifierLoc(), diag::err_param_redefinition,
              ParmII->getName());
         ParmII = 0;

Modified: cfe/cfe/trunk/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Sema/SemaDecl.cpp?rev=39313&r1=39312&r2=39313&view=diff

==============================================================================
--- cfe/cfe/trunk/Sema/SemaDecl.cpp (original)
+++ cfe/cfe/trunk/Sema/SemaDecl.cpp Wed Jul 11 11:42:55 2007
@@ -475,7 +475,7 @@
     // Keep track of the number of named members.
     if (IdentifierInfo *II = FD->getIdentifier()) {
       // Detect duplicate member names.
-      if (!FieldIDs.insert(II).second) {
+      if (!FieldIDs.insert(II)) {
         Diag(FD->getLocation(), diag::err_duplicate_member, II->getName());
         // Find the previous decl.
         SourceLocation PrevLoc;
@@ -520,7 +520,6 @@
     }
   }
   
-  
   TypeRef Ty = Context.getTagDeclType(TheEnumDecl);
   EnumConstantDecl *New = new EnumConstantDecl(IdLoc, Id, Ty);