| Index: base/time/time_mac.cc
|
| diff --git a/base/time/time_mac.cc b/base/time/time_mac.cc
|
| index 578e03904b97c239024b3f9a070d9a3699f43572..3832e9d01fe9e3e747a42a873c6e2030fd2e91ea 100644
|
| --- a/base/time/time_mac.cc
|
| +++ b/base/time/time_mac.cc
|
| @@ -135,8 +135,8 @@ Time Time::Now() {
|
|
|
| // static
|
| Time Time::FromCFAbsoluteTime(CFAbsoluteTime t) {
|
| - COMPILE_ASSERT(std::numeric_limits<CFAbsoluteTime>::has_infinity,
|
| - numeric_limits_infinity_is_undefined_when_not_has_infinity);
|
| + static_assert(std::numeric_limits<CFAbsoluteTime>::has_infinity,
|
| + "numeric_limits_infinity_is_undefined_when_not_has_infinity");
|
| if (t == 0)
|
| return Time(); // Consider 0 as a null Time.
|
| if (t == std::numeric_limits<CFAbsoluteTime>::infinity())
|
| @@ -147,8 +147,8 @@ Time Time::FromCFAbsoluteTime(CFAbsoluteTime t) {
|
| }
|
|
|
| CFAbsoluteTime Time::ToCFAbsoluteTime() const {
|
| - COMPILE_ASSERT(std::numeric_limits<CFAbsoluteTime>::has_infinity,
|
| - numeric_limits_infinity_is_undefined_when_not_has_infinity);
|
| + static_assert(std::numeric_limits<CFAbsoluteTime>::has_infinity,
|
| + "numeric_limits_infinity_is_undefined_when_not_has_infinity");
|
| if (is_null())
|
| return 0; // Consider 0 as a null Time.
|
| if (is_max())
|
|
|