Use raw_ostream and Format.h on Windows so that we don't have to roll

our own portability system to cope without snprintf.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207389 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth 2014-04-28 01:57:46 +00:00
parent d1536b3088
commit 98e5006d92

View File

@ -12,6 +12,8 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "WindowsSupport.h" #include "WindowsSupport.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
#include <cctype> #include <cctype>
#include <time.h> #include <time.h>
@ -32,6 +34,7 @@ TimeValue TimeValue::now() {
} }
std::string TimeValue::str() const { std::string TimeValue::str() const {
std::string S;
struct tm *LT; struct tm *LT;
#ifdef __MINGW32__ #ifdef __MINGW32__
// Old versions of mingw don't have _localtime64_s. Remove this once we drop support // Old versions of mingw don't have _localtime64_s. Remove this once we drop support
@ -47,9 +50,11 @@ std::string TimeValue::str() const {
LT = &Storage; LT = &Storage;
#endif #endif
char Buffer1[sizeof("YYYY-MM-DD HH:MM:SS")]; char Buffer[sizeof("YYYY-MM-DD HH:MM:SS")];
strftime(Buffer1, sizeof(Buffer1), "%Y-%m-%d %H:%M:%S", LT); strftime(Buffer, sizeof(Buffer), "%Y-%m-%d %H:%M:%S", LT);
char Buffer2[sizeof("YYYY-MM-DD HH:MM:SS.MMMUUUNNN")]; raw_string_ostream OS(S);
snprintf(Buffer2, sizeof(Buffer2), "%s.%.9u", Buffer1, this->nanoseconds()); OS << format("%s.%.9u", static_cast<const char *>(Buffer),
return std::string(Buffer2); this->nanoseconds());
OS.flush();
return S;
} }