diff options
| author | Tor Egge <Tor.Egge@yahooinc.com> | 2023-04-03 11:55:24 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@yahooinc.com> | 2023-04-03 11:55:24 +0200 |
| commit | 93594e3e47dc1ef85439fe4b06917f4967956da0 (patch) | |
| tree | 471d4cc09c9c25bec8432a8d7ccdd6fa08af5557 | |
| parent | 1c2d6585d6487b1fe6fef7f69582fc6dafdc6a2a (diff) | |
Workarounds for libc++ 15 are still needed for libc++ 16.
| -rw-r--r-- | document/src/vespa/document/select/parse_utils.cpp | 2 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/util/time.cpp | 2 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/util/time.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/document/src/vespa/document/select/parse_utils.cpp b/document/src/vespa/document/select/parse_utils.cpp index 95461442349..4c116d5bff4 100644 --- a/document/src/vespa/document/select/parse_utils.cpp +++ b/document/src/vespa/document/select/parse_utils.cpp @@ -24,7 +24,7 @@ parse_i64(const char* str, size_t len, int64_t& out) { } bool parse_double(const char* str, size_t len, double& out) { -#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000 +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 170000 // Temporary workaround that also handles underflow (cf. issue 3081) // until libc++ supports std::from_chars for double char *str_end = const_cast<char*>(str) + len; diff --git a/vespalib/src/vespa/vespalib/util/time.cpp b/vespalib/src/vespa/vespalib/util/time.cpp index cba26f24059..dd4972b1c21 100644 --- a/vespalib/src/vespa/vespalib/util/time.cpp +++ b/vespalib/src/vespa/vespalib/util/time.cpp @@ -93,7 +93,7 @@ Timer::waitAtLeast(duration dur, bool busyWait) { } -#if (defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000) || (!defined(_LIBCPP_VERSION) && defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 12) +#if (defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 170000) || (!defined(_LIBCPP_VERSION) && defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 12) // Temporary workaround until libc++ supports stream operators for duration // Temporary workaround while using libstdc++ 11 diff --git a/vespalib/src/vespa/vespalib/util/time.h b/vespalib/src/vespa/vespalib/util/time.h index b893661832f..10077a0b49a 100644 --- a/vespalib/src/vespa/vespalib/util/time.h +++ b/vespalib/src/vespa/vespalib/util/time.h @@ -101,7 +101,7 @@ duration adjustTimeoutByHz(duration timeout, long hz); } -#if (defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000) || (!defined(_LIBCPP_VERSION) && defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 12) +#if (defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 170000) || (!defined(_LIBCPP_VERSION) && defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 12) // Temporary workaround until libc++ supports stream operators for duration // Temporary workaround while using libstdc++ 11 |