diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2016-09-22 17:46:22 -0700 |
|---|---|---|
| committer |  Bo Yang <teboring@google.com> | 2016-10-10 11:44:21 -0700 |
| commit | 460e7dd7c47b5a3fc290008317c044fac741916a (patch) | |
| tree | 07ba6084281627598eff9afeeafe4a381bd90569 /src/google/protobuf/util/time_util.cc | |
| parent | 4cf072248fc39d1c63dcb1600ff9e73df8757779 (diff) | |
Fix Visual Studio compile issues.
Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e
Diffstat (limited to 'src/google/protobuf/util/time_util.cc')
| -rw-r--r-- | src/google/protobuf/util/time_util.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/google/protobuf/util/time_util.cc b/src/google/protobuf/util/time_util.cc index 031d019a..b11f822a 100644 --- a/src/google/protobuf/util/time_util.cc +++ b/src/google/protobuf/util/time_util.cc @@ -143,11 +143,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). +// some compilers don't like it). +#ifndef _MSC_VER const int64 TimeUtil::kTimestampMinSeconds; const int64 TimeUtil::kTimestampMaxSeconds; const int64 TimeUtil::kDurationMaxSeconds; const int64 TimeUtil::kDurationMinSeconds; +#endif // !_MSC_VER string TimeUtil::ToString(const Timestamp& timestamp) { return FormatTime(timestamp.seconds(), timestamp.nanos()); |