update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / utilities / persistent_cache / persistent_cache_util.h

diff --git a/ceph/src/rocksdb/utilities/persistent_cache/persistent_cache_util.h b/ceph/src/rocksdb/utilities/persistent_cache/persistent_cache_util.h
index 214bb5875d63dc654ffe9fa44fc13e29bf90c3f3..2a769652dbdae2605e92b68d92c6b1f5c02185db 100644 (file)
--- a/ceph/src/rocksdb/utilities/persistent_cache/persistent_cache_util.h
+++ b/ceph/src/rocksdb/utilities/persistent_cache/persistent_cache_util.h
@@ -9,7 +9,7 @@
 
 #include "util/mutexlock.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 //
 // Simple synchronized queue implementation with the option of
@@ -48,7 +48,7 @@ class BoundedQueue {
     T t = std::move(q_.front());
     size_ -= t.Size();
     q_.pop_front();
-    return std::move(t);
+    return t;
   }
 
   size_t Size() const {
@@ -64,4 +64,4 @@ class BoundedQueue {
   const size_t max_size_;
 };
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE