Silenced a VC++ warning.

Updated VC++ project files.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@42015 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/AST/Expr.cpp b/AST/Expr.cpp
index 8ce5846cceb5e4be26632551fe342703d28eda30..620c29b095f96fccc8302b88f2d94da31eb4ec3e 100644 (file)
--- a/AST/Expr.cpp
+++ b/AST/Expr.cpp
@@ -368,7 +368,8 @@ bool Expr::isConstantExpr(ASTContext &Ctx, SourceLocation *Loc) const {
   case CallExprClass: {
     const CallExpr *CE = cast<CallExpr>(this);
     llvm::APSInt Result(32);
-    Result.zextOrTrunc(Ctx.getTypeSize(getType(), CE->getLocStart()));
+    Result.zextOrTrunc(
+      static_cast<uint32_t>(Ctx.getTypeSize(getType(), CE->getLocStart())));
     if (CE->isBuiltinClassifyType(Result))
       break;
     if (Loc) *Loc = getLocStart();

diff --git a/win32/clangDriver/clangDriver.vcproj b/win32/clangDriver/clangDriver.vcproj
index f559cf5e0db6cef8ca2f33348b79cab3044f5111..c38b2ac29968f911b13d91bc0e66c84f5dea8d82 100644 (file)
--- a/win32/clangDriver/clangDriver.vcproj
+++ b/win32/clangDriver/clangDriver.vcproj
@@ -197,10 +197,6 @@
                                RelativePath="..\..\Driver\DiagChecker.cpp"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\Driver\LLVMCodegen.cpp"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\Driver\PrintParserCallbacks.cpp"\r
                                >\r