update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rgw / rgw_formats.h

diff --git a/ceph/src/rgw/rgw_formats.h b/ceph/src/rgw/rgw_formats.h
index 1ffc8cd4521cce6bd3610bf8e8040d1dfd8d895e..10cc0debfe45d39c5eb3dc40b34e4e5ecb4508de 100644 (file)
--- a/ceph/src/rgw/rgw_formats.h
+++ b/ceph/src/rgw/rgw_formats.h
@@ -41,7 +41,7 @@ public:
   void dump_unsigned(const char *name, uint64_t u) override;
   void dump_int(const char *name, int64_t u) override;
   void dump_float(const char *name, double d) override;
-  void dump_string(const char *name, boost::string_view s) override;
+  void dump_string(const char *name, std::string_view s) override;
   std::ostream& dump_stream(const char *name) override;
   void dump_format_va(const char *name, const char *ns, bool quoted, const char *fmt, va_list ap) override;
   int get_len() const override;
@@ -125,4 +125,12 @@ public:
   RGWStreamFlusher(Formatter *f, ostream& _os) : RGWFormatterFlusher(f), os(_os) {}
 };
 
+class RGWNullFlusher : public RGWFormatterFlusher {
+protected:
+  void do_flush() override {
+  }
+public:
+  RGWNullFlusher() : RGWFormatterFlusher(nullptr) {}
+};
+
 #endif