| Index: base/time/time.cc
|
| diff --git a/base/time/time.cc b/base/time/time.cc
|
| index 1a3f6c38c50f4b6f0fed5f9f1a999f477b7db82c..5f495e3f1e57002a33c5b241d9828e8d2884a641 100644
|
| --- a/base/time/time.cc
|
| +++ b/base/time/time.cc
|
| @@ -5,24 +5,15 @@
|
| #include "base/time/time.h"
|
|
|
| #include <math.h>
|
| -#if defined(OS_WIN)
|
| -#include <float.h>
|
| -#endif
|
| -
|
| #include <limits>
|
|
|
| +#include "base/float_util.h"
|
| #include "base/logging.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/third_party/nspr/prtime.h"
|
|
|
| namespace base {
|
|
|
| -namespace {
|
| -#if defined(OS_WIN)
|
| -inline bool isnan(double num) { return !!_isnan(num); }
|
| -#endif
|
| -}
|
| -
|
| // TimeDelta ------------------------------------------------------------------
|
|
|
| int TimeDelta::InDays() const {
|
| @@ -95,7 +86,7 @@ time_t Time::ToTimeT() const {
|
|
|
| // static
|
| Time Time::FromDoubleT(double dt) {
|
| - if (dt == 0 || isnan(dt))
|
| + if (dt == 0 || IsNaN(dt))
|
| return Time(); // Preserve 0 so we can tell it doesn't exist.
|
| if (dt == std::numeric_limits<double>::max())
|
| return Max();
|
|
|