diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-11-21T13·43+0100 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T14·48+0100 |
| commit | 082c006c04343a78d87b6c6ab3608c25d6213c3f (patch) | |
| tree | 16e6f04f8d1d1d2d67e8e917d5e7bb48c1b60375 /third_party/abseil_cpp/absl/base/internal/unscaledcycleclock.cc | |
| parent | cc27324d0226953943f408ce3c69ad7d648e005e (diff) | |
merge(3p/absl): subtree merge of Abseil up to e19260f r/1889
... notably, this includes Abseil's own StatusOr type, which conflicted with our implementation (that was taken from TensorFlow). Change-Id: Ie7d6764b64055caaeb8dc7b6b9d066291e6b538f
Diffstat (limited to 'third_party/abseil_cpp/absl/base/internal/unscaledcycleclock.cc')
| -rw-r--r-- | third_party/abseil_cpp/absl/base/internal/unscaledcycleclock.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/third_party/abseil_cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil_cpp/absl/base/internal/unscaledcycleclock.cc index f1e7bbef84..1545288cf2 100644 --- a/third_party/abseil_cpp/absl/base/internal/unscaledcycleclock.cc +++ b/third_party/abseil_cpp/absl/base/internal/unscaledcycleclock.cc @@ -123,9 +123,7 @@ double UnscaledCycleClock::Frequency() { #pragma intrinsic(__rdtsc) -int64_t UnscaledCycleClock::Now() { - return __rdtsc(); -} +int64_t UnscaledCycleClock::Now() { return __rdtsc(); } double UnscaledCycleClock::Frequency() { return base_internal::NominalCPUFrequency(); |