update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / seastar / include / seastar / json / json_elements.hh

diff --git a/ceph/src/seastar/include/seastar/json/json_elements.hh b/ceph/src/seastar/include/seastar/json/json_elements.hh
index c60dcd1049f853310aa73f72d177d5507e2e6d74..929e1bdf2930fff056d803e5fedb753e3027242f 100644 (file)
--- a/ceph/src/seastar/include/seastar/json/json_elements.hh
+++ b/ceph/src/seastar/include/seastar/json/json_elements.hh
@@ -25,6 +25,8 @@
 #include <vector>
 #include <time.h>
 #include <sstream>
+#include <seastar/core/do_with.hh>
+#include <seastar/core/loop.hh>
 #include <seastar/json/formatter.hh>
 #include <seastar/core/sstring.hh>
 #include <seastar/core/iostream.hh>
@@ -310,7 +312,7 @@ struct json_return_type {
  * return make_ready_future<json::json_return_type>(stream_range_as_array(res, [](const auto&i) {return i.first}));
  */
 template<typename Container, typename Func>
-GCC6_CONCEPT( requires requires (Container c, Func aa, output_stream<char> s) { { formatter::write(s, aa(*c.begin())) } -> future<>; } )
+SEASTAR_CONCEPT( requires requires (Container c, Func aa, output_stream<char> s) { { formatter::write(s, aa(*c.begin())) } -> std::same_as<future<>>; } )
 std::function<future<>(output_stream<char>&&)> stream_range_as_array(Container val, Func fun) {
     return [val = std::move(val), fun = std::move(fun)](output_stream<char>&& s) {
         return do_with(output_stream<char>(std::move(s)), Container(std::move(val)), Func(std::move(fun)), true, [](output_stream<char>& s, const Container& val, const Func& f, bool& first){