update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / include / object.h

diff --git a/ceph/src/include/object.h b/ceph/src/include/object.h
index b0f21bc455806804bcf50e51873f8aa88929abc2..96951e74de79b881028348d86c05b72d747d15ef 100644 (file)
--- a/ceph/src/include/object.h
+++ b/ceph/src/include/object.h
@@ -17,10 +17,11 @@
 
 #include <cstdint>
 #include <cstdio>
-#include <iosfwd>
 #include <iomanip>
+#include <iosfwd>
 #include <string>
-
+#include <string>
+#include <string_view>
 
 #include "include/rados.h"
 #include "include/unordered_map.h"
@@ -40,6 +41,8 @@ struct object_t {
   object_t(const char *s) : name(s) {}
   // cppcheck-suppress noExplicitConstructor
   object_t(const std::string& s) : name(s) {}
+  object_t(std::string&& s) : name(std::move(s)) {}
+  object_t(std::string_view s) : name(s) {}
 
   void swap(object_t& o) {
     name.swap(o.name);