diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2014-04-28 01:57:46 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2014-04-28 01:57:46 +0000 |
commit | e4c3994991c9f92568ae92a4016a582fa86f7f43 (patch) | |
tree | 44c89dcae8c62941573ecc57a4d00f07e1b7be3e | |
parent | 73dc912a6ae9256feaf6a0c32db535ad31ed658f (diff) | |
download | bcm5719-llvm-e4c3994991c9f92568ae92a4016a582fa86f7f43.tar.gz bcm5719-llvm-e4c3994991c9f92568ae92a4016a582fa86f7f43.zip |
Use raw_ostream and Format.h on Windows so that we don't have to roll
our own portability system to cope without snprintf.
llvm-svn: 207389
-rw-r--r-- | llvm/lib/Support/Windows/TimeValue.inc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/llvm/lib/Support/Windows/TimeValue.inc b/llvm/lib/Support/Windows/TimeValue.inc index 166d0d59c1d..0223ab42448 100644 --- a/llvm/lib/Support/Windows/TimeValue.inc +++ b/llvm/lib/Support/Windows/TimeValue.inc @@ -12,6 +12,8 @@ //===----------------------------------------------------------------------===// #include "WindowsSupport.h" +#include "llvm/Support/Format.h" +#include "llvm/Support/raw_ostream.h" #include <cctype> #include <time.h> @@ -32,6 +34,7 @@ TimeValue TimeValue::now() { } std::string TimeValue::str() const { + std::string S; struct tm *LT; #ifdef __MINGW32__ // 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; #endif - char Buffer1[sizeof("YYYY-MM-DD HH:MM:SS")]; - strftime(Buffer1, sizeof(Buffer1), "%Y-%m-%d %H:%M:%S", LT); - char Buffer2[sizeof("YYYY-MM-DD HH:MM:SS.MMMUUUNNN")]; - snprintf(Buffer2, sizeof(Buffer2), "%s.%.9u", Buffer1, this->nanoseconds()); - return std::string(Buffer2); + char Buffer[sizeof("YYYY-MM-DD HH:MM:SS")]; + strftime(Buffer, sizeof(Buffer), "%Y-%m-%d %H:%M:%S", LT); + raw_string_ostream OS(S); + OS << format("%s.%.9u", static_cast<const char *>(Buffer), + this->nanoseconds()); + OS.flush(); + return S; } |