update ceph source to reef 18.1.2

[ceph.git] / ceph / src / seastar / include / seastar / http / api_docs.hh

diff --git a/ceph/src/seastar/include/seastar/http/api_docs.hh b/ceph/src/seastar/include/seastar/http/api_docs.hh
index a33b5b5d7336d5d48d32ae129a2636e3d05fe2d8..325dd5e1542cecf51c8214bf9f3a7e4b862520ee 100644 (file)
--- a/ceph/src/seastar/include/seastar/http/api_docs.hh
+++ b/ceph/src/seastar/include/seastar/http/api_docs.hh
@@ -125,11 +125,11 @@ public:
         set_route(this);
     }
 
-    future<std::unique_ptr<reply>> handle(const sstring& path,
-            std::unique_ptr<request> req, std::unique_ptr<reply> rep) override {
+    future<std::unique_ptr<http::reply>> handle(const sstring& path,
+            std::unique_ptr<http::request> req, std::unique_ptr<http::reply> rep) override {
         rep->_content = json::formatter::to_json(_docs);
         rep->done("json");
-        return make_ready_future<std::unique_ptr<reply>>(std::move(rep));
+        return make_ready_future<std::unique_ptr<http::reply>>(std::move(rep));
     }
 
     void reg(const sstring& api, const sstring& description,
@@ -238,7 +238,7 @@ class api_docs_20 {
     std::vector<doc_entry> _definitions;
 
 public:
-    future<> write(output_stream<char>&&, std::unique_ptr<request> req);
+    future<> write(output_stream<char>&&, std::unique_ptr<http::request> req);
 
     void add_api(doc_entry&& f) {
         _apis.emplace_back(std::move(f));
@@ -258,12 +258,12 @@ public:
         set_route(this);
     }
 
-    future<std::unique_ptr<reply>> handle(const sstring& path,
-            std::unique_ptr<request> req, std::unique_ptr<reply> rep) override {
+    future<std::unique_ptr<http::reply>> handle(const sstring& path,
+            std::unique_ptr<http::request> req, std::unique_ptr<http::reply> rep) override {
         rep->write_body("json", [this, req = std::move(req)] (output_stream<char>&& os) mutable {
             return _docs.write(std::move(os), std::move(req));
         });
-        return make_ready_future<std::unique_ptr<reply>>(std::move(rep));
+        return make_ready_future<std::unique_ptr<http::reply>>(std::move(rep));
     }
 
     virtual void reg(doc_entry&& f) {