diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2016-07-25 10:52:44 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2016-07-25 13:18:38 -0700 |
commit | a17367f44a3b592993d2ac5c074ed58fb0ce784c (patch) | |
tree | 6437f0c99af98fe066a134bbb828b42981d4150f /src/google/protobuf/util | |
parent | 868ea59256b999175ba04c1b9cfe74ff1fbae13d (diff) |
Define intX as standard exact-width integer types.
Fixes https://github.com/google/protobuf/issues/823
Change-Id: I7f4c2bfcac2f81d8b34c030dd3d12ea02aaa2264
Diffstat (limited to 'src/google/protobuf/util')
-rw-r--r-- | src/google/protobuf/util/time_util.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/google/protobuf/util/time_util.cc b/src/google/protobuf/util/time_util.cc index c782d691..031d019a 100644 --- a/src/google/protobuf/util/time_util.cc +++ b/src/google/protobuf/util/time_util.cc @@ -142,6 +142,13 @@ int64 RoundTowardZero(int64 value, int64 divider) { } } // namespace +// Actually define these static const integers. Required by C++ standard (but +// omitting them may still work with some compilers). +const int64 TimeUtil::kTimestampMinSeconds; +const int64 TimeUtil::kTimestampMaxSeconds; +const int64 TimeUtil::kDurationMaxSeconds; +const int64 TimeUtil::kDurationMinSeconds; + string TimeUtil::ToString(const Timestamp& timestamp) { return FormatTime(timestamp.seconds(), timestamp.nanos()); } @@ -174,7 +181,7 @@ string TimeUtil::ToString(const Duration& duration) { seconds = -seconds; nanos = -nanos; } - result += StringPrintf("%" GOOGLE_LL_FORMAT "d", seconds); + result += SimpleItoa(seconds); if (nanos != 0) { result += "." + FormatNanos(nanos); } |