diff options
-rw-r--r-- | clang/Driver/ASTConsumers.cpp | 5 | ||||
-rw-r--r-- | clang/lib/Driver/Arg.cpp | 1 | ||||
-rw-r--r-- | clang/lib/Lex/Preprocessor.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/clang/Driver/ASTConsumers.cpp b/clang/Driver/ASTConsumers.cpp index 409df638c98..f04f9a3a390 100644 --- a/clang/Driver/ASTConsumers.cpp +++ b/clang/Driver/ASTConsumers.cpp @@ -1011,7 +1011,7 @@ public: std::vector<char> buf; buf.reserve(strlen(FE->getName())+100); - sprintf(&buf[0], "dev_%llx", (uint64_t) FE->getDevice()); + sprintf(&buf[0], "dev_%llx", (unsigned long long) FE->getDevice()); FName.appendComponent(&buf[0]); FName.createDirectoryOnDisk(true); if (!FName.canWrite() || !FName.isDirectory()) { @@ -1019,7 +1019,8 @@ public: return; } - sprintf(&buf[0], "%s-%llX.ast", FE->getName(), (uint64_t) FE->getInode()); + sprintf(&buf[0], "%s-%llX.ast", FE->getName(), + (unsigned long long) FE->getInode()); FName.appendComponent(&buf[0]); EmitASTBitcodeFile(&TU, FName); diff --git a/clang/lib/Driver/Arg.cpp b/clang/lib/Driver/Arg.cpp index 52437e7772b..16efda8ecfa 100644 --- a/clang/lib/Driver/Arg.cpp +++ b/clang/lib/Driver/Arg.cpp @@ -145,4 +145,5 @@ const char *JoinedAndSeparateArg::getValue(const ArgList &Args, unsigned N) const { assert(N < getNumValues() && "Invalid index."); assert(0 && "FIXME: Implement"); + return 0; } diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index 2a9fa0a85b5..e20b42ac640 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/lib/Lex/Preprocessor.cpp @@ -440,7 +440,7 @@ static void DefineTypeSize(const char *MacroName, unsigned TypeWidth, const char *ValSuffix, bool isSigned, std::vector<char> &Buf) { char MacroBuf[60]; - uint64_t MaxVal; + long long MaxVal; if (isSigned) MaxVal = (1LL << (TypeWidth - 1)) - 1; else |