diff options
| author | Abseil Team <absl-team@google.com> | 2018-08-02T17·08-0700 |
|---|---|---|
| committer | Jon Cohen <cohenjon@google.com> | 2018-08-02T17·59-0400 |
| commit | 8f96be6ca60d967bd4b37f93d0a03bcff4145200 (patch) | |
| tree | 11d279916ab48665493b316570183bd0257e1a29 /absl/time/clock.cc | |
| parent | 92e07e5590752d6b8e67f7f2f86c6286561e8cea (diff) | |
Export of internal Abseil changes.
-- 586c41e29e80d9613434f18347d4a70a92a90989 by Jon Cohen <cohenjon@google.com>: Whitespace cleanup PiperOrigin-RevId: 207119388 -- e28fc6932d68f7097918f3092079f07112e684c1 by Abseil Team <absl-team@google.com>: Fix comment typo in mutex.h PiperOrigin-RevId: 207024211 -- b7714a5f189b2863f9cfc285ba428ca2059b83f4 by Abseil Team <absl-team@google.com>: Raise the floor for gcc from gcc 4.7 to gcc 4.8. PiperOrigin-RevId: 207021220 -- 262ae79150278ea1b4e512dfe8ff05c32768f429 by Matt Armstrong <marmstrong@google.com>: Raise the floor for gcc from gcc 4.7 to gcc 4.8. PiperOrigin-RevId: 206997741 -- 5aba0b15eaf6c5beff0e91670a7cdf5ad1151886 by Derek Mauro <dmauro@google.com>: Use std::chrono to get the current time on both Apple and Windows platforms, eliminating the unnecessarily complicated logic on Apple platforms. PiperOrigin-RevId: 206979219 -- 807a91adf876f7532050d442f00268754c0f260b by Derek Mauro <dmauro@google.com>: Fix multiple definition problem when Abseil is combined with gperftools on PowerPC. https://github.com/abseil/abseil-cpp/pull/152 PiperOrigin-RevId: 206963083 GitOrigin-RevId: 586c41e29e80d9613434f18347d4a70a92a90989 Change-Id: I0ee65a733c423890b97dd3500f2d17449792387c
Diffstat (limited to 'absl/time/clock.cc')
| -rw-r--r-- | absl/time/clock.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/absl/time/clock.cc b/absl/time/clock.cc index 772f8525e84f..74ee1401b98c 100644 --- a/absl/time/clock.cc +++ b/absl/time/clock.cc @@ -57,10 +57,8 @@ Time Now() { #endif #endif -#if defined(__APPLE__) -#include "absl/time/internal/get_current_time_ios.inc" -#elif defined(_WIN32) -#include "absl/time/internal/get_current_time_windows.inc" +#if defined(__APPLE__) || defined(_WIN32) +#include "absl/time/internal/get_current_time_chrono.inc" #else #include "absl/time/internal/get_current_time_posix.inc" #endif |