Adjust constexpr qualifiers so they work in gcc < 4.9.

pull/10005/head
David L. Jones 3 years ago
parent 7f2368933a
commit 053f698e90
  1. 16
      src/google/protobuf/util/time_util.cc

@ -165,14 +165,14 @@ int64_t RoundTowardZero(int64_t value, int64_t divider) {
// Actually define these static const integers. Required by C++ standard (but // Actually define these static const integers. Required by C++ standard (but
// some compilers don't like it). // some compilers don't like it).
#ifndef _MSC_VER #ifndef _MSC_VER
const int64_t TimeUtil::kTimestampMinSeconds; constexpr int64_t TimeUtil::kTimestampMinSeconds;
const int64_t TimeUtil::kTimestampMaxSeconds; constexpr int64_t TimeUtil::kTimestampMaxSeconds;
const int32_t TimeUtil::kTimestampMinNanoseconds; constexpr int32_t TimeUtil::kTimestampMinNanoseconds;
const int32_t TimeUtil::kTimestampMaxNanoseconds; constexpr int32_t TimeUtil::kTimestampMaxNanoseconds;
const int64_t TimeUtil::kDurationMaxSeconds; constexpr int64_t TimeUtil::kDurationMaxSeconds;
const int64_t TimeUtil::kDurationMinSeconds; constexpr int64_t TimeUtil::kDurationMinSeconds;
const int32_t TimeUtil::kDurationMaxNanoseconds; constexpr int32_t TimeUtil::kDurationMaxNanoseconds;
const int32_t TimeUtil::kDurationMinNanoseconds; constexpr int32_t TimeUtil::kDurationMinNanoseconds;
#endif // !_MSC_VER #endif // !_MSC_VER
std::string TimeUtil::ToString(const Timestamp& timestamp) { std::string TimeUtil::ToString(const Timestamp& timestamp) {

Loading…
Cancel
Save