Merge pull request #36602 from vespa-engine/toregge/drop-old-workarounds

Drop old workarounds.

Author: toregge

document/src/vespa/document/select/parse_utils.cpp

@@ -24,24 +24,12 @@ bool 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 < 200000
-    // 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;
-    double out0 = vespalib::locale::c::strtod_au(str, &str_end);
-    if (str_end != str + len) {
-        return false;
-    }
-    out = out0;
-    return true;
-#else
     auto res = std::from_chars(str, str + len, out);
     if (res.ec == std::errc::result_out_of_range) {
         out = (str[0] == '-') ? -std::numeric_limits<double>::infinity() : std::numeric_limits<double>::infinity();
         return true;
     }
     return (res.ec == std::errc()) && (res.ptr == str + len);
-#endif
 }
 
 } // namespace document::select::util

vespalib/src/vespa/vespalib/util/time.cpp

@@ -92,21 +92,3 @@ void Timer::waitAtLeast(duration dur, bool busyWait) {
 }
 
 } // namespace vespalib
-
-#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
-
-#include <ostream>
-
-namespace std::chrono {
-
-ostream& operator<<(ostream& os, const nanoseconds& value) {
-    os << value.count() << "ns";
-    return os;
-}
-
-} // namespace std::chrono
-#endif

vespalib/src/vespa/vespalib/util/time.h

@@ -104,18 +104,3 @@ duration adjustTimeoutByDetectedHz(duration timeout);
 duration adjustTimeoutByHz(duration timeout, long hz);
 
 } // namespace vespalib
-
-#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
-
-#include <iosfwd>
-
-namespace std::chrono {
-
-ostream& operator<<(ostream& os, const nanoseconds& value);
-
-}
-#endif