From: Hartmut Kaiser Date: Sun, 16 Sep 2007 00:04:22 +0000 (+0000) Subject: Updated VC++ build system. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ff4f0cc794561e9a71f984551894be0f8660ead;p=clang Updated VC++ build system. Silenced a couple of VC++ warnings. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41994 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/Sema/SemaStmt.cpp b/Sema/SemaStmt.cpp index 7b544a2807..7dac6011f8 100644 --- a/Sema/SemaStmt.cpp +++ b/Sema/SemaStmt.cpp @@ -280,7 +280,8 @@ Sema::FinishSwitchStmt(SourceLocation SwitchLoc, StmtTy *Switch, ExprTy *Body) { // Get the bitwidth of the switched-on value before promotions. We must // convert the integer case values to this width before comparison. - unsigned CondWidth = Context.getTypeSize(CondType, SwitchLoc); + unsigned CondWidth = + static_cast(Context.getTypeSize(CondType, SwitchLoc)); bool CondIsSigned = CondType->isSignedIntegerType(); // Accumulate all of the case values in a vector so that we can sort them diff --git a/include/clang/Basic/TargetInfo.h b/include/clang/Basic/TargetInfo.h index 4eb6c3df3e..72cde09c38 100644 --- a/include/clang/Basic/TargetInfo.h +++ b/include/clang/Basic/TargetInfo.h @@ -150,7 +150,8 @@ public: /// getFloatInfo - Return the size of 'float' for this target, in bits. void getFloatInfo(uint64_t &Size, unsigned &Align, SourceLocation Loc) { - Align = Size = 32; // FIXME: implement correctly. + Align = 32; // FIXME: implement correctly. + Size = 32; } /// getDoubleInfo - Return the size of 'double' for this target, in bits. @@ -191,31 +192,31 @@ public: unsigned getCharWidth(SourceLocation Loc) { uint64_t Size; unsigned Align; getCharInfo(Size, Align, Loc); - return Size; + return static_cast(Size); } unsigned getWCharWidth(SourceLocation Loc) { uint64_t Size; unsigned Align; getWCharInfo(Size, Align, Loc); - return Size; + return static_cast(Size); } unsigned getIntWidth(SourceLocation Loc) { uint64_t Size; unsigned Align; getIntInfo(Size, Align, Loc); - return Size; + return static_cast(Size); } unsigned getLongWidth(SourceLocation Loc) { uint64_t Size; unsigned Align; getLongInfo(Size, Align, Loc); - return Size; + return static_cast(Size); } unsigned getLongLongWidth(SourceLocation Loc) { uint64_t Size; unsigned Align; getLongLongInfo(Size, Align, Loc); - return Size; + return static_cast(Size); } private: void ComputeWCharInfo(SourceLocation Loc); diff --git a/include/clang/Parse/Action.h b/include/clang/Parse/Action.h index 014c7818e3..ee11b68444 100644 --- a/include/clang/Parse/Action.h +++ b/include/clang/Parse/Action.h @@ -21,7 +21,7 @@ namespace clang { // Semantic. class DeclSpec; class Declarator; - class ObjcKeywordInfo; + struct ObjcKeywordInfo; class AttributeList; // Parse. class Scope; diff --git a/win32/clangAST/clangAST.vcproj b/win32/clangAST/clangAST.vcproj index 943f146bb7..31de24ab71 100644 --- a/win32/clangAST/clangAST.vcproj +++ b/win32/clangAST/clangAST.vcproj @@ -202,6 +202,10 @@ RelativePath="..\..\include\clang\AST\AST.h" > + + @@ -226,6 +230,10 @@ RelativePath="..\..\include\clang\AST\ExprCXX.h" > + + diff --git a/win32/clangAnalysis/clangAnalysis.vcproj b/win32/clangAnalysis/clangAnalysis.vcproj index 49aca4eab2..220cf7d3a9 100644 --- a/win32/clangAnalysis/clangAnalysis.vcproj +++ b/win32/clangAnalysis/clangAnalysis.vcproj @@ -160,12 +160,36 @@ RelativePath="..\..\Analysis\LiveVariables.cpp" > + + + + + + + + + + + + @@ -174,6 +198,10 @@ RelativePath="..\..\include\clang\Analysis\LocalCheckers.h" > + + diff --git a/win32/clangRewrite/clangRewrite.vcproj b/win32/clangRewrite/clangRewrite.vcproj new file mode 100644 index 0000000000..1d2ffea28d --- /dev/null +++ b/win32/clangRewrite/clangRewrite.vcproj @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +