[cfe-commits] r70086 - in /cfe/trunk/lib: AST/DeclCXX.cpp AST/ExprCXX.cpp Lex/TokenLexer.cpp

[Eli Friedman]

Author: efriedma
Date: Sat Apr 25 17:20:56 2009
New Revision: 70086

URL: http://llvm.org/viewvc/llvm-project?rev=70086&view=rev
Log:
Silence gcc warnings.


Modified:
    cfe/trunk/lib/AST/DeclCXX.cpp
    cfe/trunk/lib/AST/ExprCXX.cpp
    cfe/trunk/lib/Lex/TokenLexer.cpp

Modified: cfe/trunk/lib/AST/DeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclCXX.cpp?rev=70086&r1=70085&r2=70086&view=diff

==============================================================================
--- cfe/trunk/lib/AST/DeclCXX.cpp (original)
+++ cfe/trunk/lib/AST/DeclCXX.cpp Sat Apr 25 17:20:56 2009
@@ -377,8 +377,8 @@
 
 CXXTempVarDecl *CXXTempVarDecl::Create(ASTContext &C, DeclContext *DC,
                                        QualType T) {
-  assert(T->isDependentType() || 
-         isa<CXXRecordDecl>(T->getAsRecordType()->getDecl()) &&
+  assert((T->isDependentType() || 
+          isa<CXXRecordDecl>(T->getAsRecordType()->getDecl())) &&
          "CXXTempVarDecl must either have a dependent type "
          "or a C++ record type!");
   return new (C) CXXTempVarDecl(DC, T);

Modified: cfe/trunk/lib/AST/ExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ExprCXX.cpp?rev=70086&r1=70085&r2=70086&view=diff

==============================================================================
--- cfe/trunk/lib/AST/ExprCXX.cpp (original)
+++ cfe/trunk/lib/AST/ExprCXX.cpp Sat Apr 25 17:20:56 2009
@@ -268,7 +268,7 @@
 }
 
 CXXDestroyExpr *CXXDestroyExpr::Create(ASTContext &C, VarDecl *vd) {
-  assert(vd->getKind() == Decl::CXXTempVar || vd->getKind() == Decl::Var &&
+  assert((vd->getKind() == Decl::CXXTempVar || vd->getKind() == Decl::Var) &&
          "Can only create a destroy expr with a temp var decl or a var decl!");
 
   return new (C) CXXDestroyExpr(vd, C.VoidTy);

Modified: cfe/trunk/lib/Lex/TokenLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/TokenLexer.cpp?rev=70086&r1=70085&r2=70086&view=diff

==============================================================================
--- cfe/trunk/lib/Lex/TokenLexer.cpp (original)
+++ cfe/trunk/lib/Lex/TokenLexer.cpp Sat Apr 25 17:20:56 2009
@@ -311,7 +311,7 @@
   bool TokenIsFromPaste = false;
   
   // If this token is followed by a token paste (##) operator, paste the tokens!
-  if (!isAtEnd() && Tokens[CurToken].is(tok::hashhash))
+  if (!isAtEnd() && Tokens[CurToken].is(tok::hashhash)) {
     if (PasteTokens(Tok)) {
       // When handling the microsoft /##/ extension, the final token is
       // returned by PasteTokens, not the pasted token.
@@ -319,7 +319,7 @@
     } else {
       TokenIsFromPaste = true;
     }
-      
+  }   
 
   // The token's current location indicate where the token was lexed from.  We
   // need this information to compute the spelling of the token, but any