Merge pull request #25996 from vespa-engine/toregge/add-workaround-for-libcxx-lacking-ostream-operator-for-duration

Add workaround for libc++ lacking stream operators for duration.

2 files changed, 31 insertions, 0 deletions

diff --git a/vespalib/src/vespa/vespalib/util/time.cpp b/vespalib/src/vespa/vespalib/util/time.cpp
index 51d5e580609..42155647870 100644
--- a/vespalib/src/vespa/vespalib/util/time.cpp
+++ b/vespalib/src/vespa/vespalib/util/time.cpp
@@ -92,3 +92,21 @@ Timer::waitAtLeast(duration dur, bool busyWait) {
 }
 
 }
+
+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000
+
+// Temporary workaround until libc++ supports stream operators for duration
+
+#include <ostream>
+
+namespace std::chrono {
+
+ostream&
+operator<<(ostream& os, const nanoseconds& value)
+{
+    os << value.count() << "ns";
+    return os;
+}
+
+}
+#endif
diff --git a/vespalib/src/vespa/vespalib/util/time.h b/vespalib/src/vespa/vespalib/util/time.h
index ce914b097d4..27f359071ae 100644
--- a/vespalib/src/vespa/vespalib/util/time.h
+++ b/vespalib/src/vespa/vespalib/util/time.h
@@ -99,3 +99,16 @@ duration adjustTimeoutByDetectedHz(duration timeout);
 duration adjustTimeoutByHz(duration timeout, long hz);
 
 }
+
+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000
+
+// Temporary workaround until libc++ supports stream operators for duration
+
+#include <iosfwd>
+
+namespace std::chrono {
+
+ostream& operator<<(ostream& os, const nanoseconds& value);
+
+}
+#endif