diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-23 19:33:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 19:33:13 +0200 |
| commit | daf76f530fa8e0f09b33e17c6728af2065ec8d44 (patch) | |
| tree | 4a731af1ba9b17b7ac896f26f334b6785d13d23a | |
| parent | 5ab026fa9ddd6912800c136775ebe60faba8f0e1 (diff) | |
| parent | 8237ddf4aca94d347ffeb8450e5f90b37a8b8b2f (diff) | |
Merge pull request #13040 from vespa-engine/toregge/disable-clock-computation-hack-when-using-clang
If compiler is clang then disable the clock computation hack.
| -rw-r--r-- | vespalib/src/vespa/vespalib/util/time.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vespalib/src/vespa/vespalib/util/time.cpp b/vespalib/src/vespa/vespalib/util/time.cpp index 61a295c6dc3..341102bf9ff 100644 --- a/vespalib/src/vespa/vespalib/util/time.cpp +++ b/vespalib/src/vespa/vespalib/util/time.cpp @@ -53,6 +53,8 @@ Timer::waitAtLeast(duration dur, bool busyWait) { } +#ifndef __clang__ + namespace std::chrono { /* @@ -83,3 +85,4 @@ steady_clock::now() noexcept { } } +#endif |