update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/rgw/rgw_crypt_sanitize.h b/ceph/src/rgw/rgw_crypt_sanitize.h
index 64d37186c9c57f81797b228a8db8f09efce745a3..662a7977d31275019931708f464f9e3c002059b9 100644 (file)
--- a/ceph/src/rgw/rgw_crypt_sanitize.h
+++ b/ceph/src/rgw/rgw_crypt_sanitize.h
@@ -4,8 +4,7 @@
 #ifndef RGW_RGW_CRYPT_SANITIZE_H_
 #define RGW_RGW_CRYPT_SANITIZE_H_
 
-#include <boost/utility/string_view.hpp>
-
+#include <string_view>
 #include "rgw_common.h"
 
 namespace rgw {
@@ -15,10 +14,10 @@ namespace crypt_sanitize {
  * Temporary container for suppressing printing if variable contains secret key.
  */
 struct env {
-  boost::string_ref name;
-  boost::string_ref value;
+  std::string_view name;
+  std::string_view value;
 
-  env(boost::string_ref name, boost::string_ref value)
+  env(std::string_view name, std::string_view value)
   : name(name), value(value) {}
 };
 
@@ -26,9 +25,9 @@ struct env {
  * Temporary container for suppressing printing if aws meta attributes contains secret key.
  */
 struct x_meta_map {
-  boost::string_ref name;
-  boost::string_ref value;
-  x_meta_map(boost::string_ref name, boost::string_ref value)
+  std::string_view name;
+  std::string_view value;
+  x_meta_map(std::string_view name, std::string_view value)
   : name(name), value(value) {}
 };
 
@@ -36,9 +35,9 @@ struct x_meta_map {
  * Temporary container for suppressing printing if s3_policy calculation variable contains secret key.
  */
 struct s3_policy {
-  boost::string_ref name;
-  boost::string_ref value;
-  s3_policy(boost::string_ref name, boost::string_ref value)
+  std::string_view name;
+  std::string_view value;
+  s3_policy(std::string_view name, std::string_view value)
   : name(name), value(value) {}
 };
 
@@ -47,8 +46,8 @@ struct s3_policy {
  */
 struct auth {
   const req_state* const s;
-  boost::string_ref value;
-  auth(const req_state* const s, boost::string_ref value)
+  std::string_view value;
+  auth(const req_state* const s, std::string_view value)
   : s(s), value(value) {}
 };
 
@@ -56,8 +55,8 @@ struct auth {
  * Temporary container for suppressing printing if log made from civetweb may contain secret key.
  */
 struct log_content {
-  const boost::string_view buf;
-  explicit log_content(const boost::string_view buf)
+  const std::string_view buf;
+  explicit log_content(const std::string_view buf)
   : buf(buf) {}
 };