import quincy beta 17.1.0

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

diff --git a/ceph/src/rgw/rgw_datalog.h b/ceph/src/rgw/rgw_datalog.h
index f609a02bf365c2d88fc7f2df6284516c357f997c..85ce61b8112bfa71619d69960e8c73c1b5f67d8a 100644 (file)
--- a/ceph/src/rgw/rgw_datalog.h
+++ b/ceph/src/rgw/rgw_datalog.h
@@ -175,10 +175,10 @@ class RGWDataChangesLog {
   const int num_shards;
   std::string get_prefix() {
     auto prefix = cct->_conf->rgw_data_log_obj_prefix;
-    return prefix.empty() ? prefix : "data_log"s;
+    return prefix.empty() ? prefix : "data_log";
   }
   std::string metadata_log_oid() {
-    return get_prefix() + "generations_metadata"s;
+    return get_prefix() + "generations_metadata";
   }
   std::string prefix;
 
@@ -210,7 +210,7 @@ class RGWDataChangesLog {
 
   ceph::mutex renew_lock = ceph::make_mutex("ChangesRenewThread::lock");
   ceph::condition_variable renew_cond;
-  void renew_run();
+  void renew_run() noexcept;
   void renew_stop();
   std::thread renew_thread;