| Index: base/time.cc
|
| diff --git a/base/time.cc b/base/time.cc
|
| index 26fd500403e961b0497cfed93b21aee97e6e9174..89c12df60717bd634ad47cbc3951d5c10bd49d3f 100644
|
| --- a/base/time.cc
|
| +++ b/base/time.cc
|
| @@ -5,12 +5,9 @@
|
| #include "base/time.h"
|
|
|
| #include <math.h>
|
| -#if defined(OS_WIN)
|
| -#include <float.h>
|
| -#endif
|
| -
|
| #include <limits>
|
|
|
| +#include "base/float_util.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/third_party/nspr/prtime.h"
|
|
|
| @@ -18,12 +15,6 @@
|
|
|
| namespace base {
|
|
|
| -namespace {
|
| -#if defined(OS_WIN)
|
| -inline bool isnan(double num) { return !!_isnan(num); }
|
| -#endif
|
| -}
|
| -
|
| // TimeDelta ------------------------------------------------------------------
|
|
|
| int TimeDelta::InDays() const {
|
| @@ -96,7 +87,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();
|
|
|