| Index: base/trace_event/trace_event_impl.cc
|
| diff --git a/base/trace_event/trace_event_impl.cc b/base/trace_event/trace_event_impl.cc
|
| index 834f826e04078dae5b992276b986a1581f6a1037..230cbebe2fb7c437f7e48022f54f1141f098c43e 100644
|
| --- a/base/trace_event/trace_event_impl.cc
|
| +++ b/base/trace_event/trace_event_impl.cc
|
| @@ -5,12 +5,12 @@
|
| #include "base/trace_event/trace_event_impl.h"
|
|
|
| #include <algorithm>
|
| +#include <cmath>
|
|
|
| #include "base/base_switches.h"
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/debug/leak_annotations.h"
|
| -#include "base/float_util.h"
|
| #include "base/format_macros.h"
|
| #include "base/json/string_escape.h"
|
| #include "base/lazy_instance.h"
|
| @@ -646,7 +646,7 @@ void TraceEvent::AppendValueAsJSON(unsigned char type,
|
| // should be made into a common method.
|
| std::string real;
|
| double val = value.as_double;
|
| - if (IsFinite(val)) {
|
| + if (std::isfinite(val)) {
|
| real = DoubleToString(val);
|
| // Ensure that the number has a .0 if there's no decimal or 'e'. This
|
| // makes sure that when we read the JSON back, it's interpreted as a
|
| @@ -664,7 +664,7 @@ void TraceEvent::AppendValueAsJSON(unsigned char type,
|
| // "-.1" bad "-0.1" good
|
| real.insert(1, "0");
|
| }
|
| - } else if (IsNaN(val)){
|
| + } else if (std::isnan(val)){
|
| // The JSON spec doesn't allow NaN and Infinity (since these are
|
| // objects in EcmaScript). Use strings instead.
|
| real = "\"NaN\"";
|
|
|