update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rocksdb / util / compression_context_cache.cc

diff --git a/ceph/src/rocksdb/util/compression_context_cache.cc b/ceph/src/rocksdb/util/compression_context_cache.cc
index a06cfb279a849c5dde81222961a29d968d64ba46..52c3fac72ac7171a3641989c5991858bbf56b474 100644 (file)
--- a/ceph/src/rocksdb/util/compression_context_cache.cc
+++ b/ceph/src/rocksdb/util/compression_context_cache.cc
@@ -9,11 +9,11 @@
 
 #include "util/compression_context_cache.h"
 
+#include <atomic>
+
 #include "util/compression.h"
 #include "util/core_local.h"
 
-#include <atomic>
-
 namespace ROCKSDB_NAMESPACE {
 namespace compression_cache {
 
@@ -65,8 +65,6 @@ static_assert(sizeof(ZSTDCachedData) % CACHE_LINE_SIZE == 0,
               "Expected CACHE_LINE_SIZE alignment");
 }  // namespace compression_cache
 
-using namespace compression_cache;
-
 class CompressionContextCache::Rep {
  public:
   Rep() {}
@@ -82,7 +80,7 @@ class CompressionContextCache::Rep {
   }
 
  private:
-  CoreLocalArray<ZSTDCachedData> per_core_uncompr_;
+  CoreLocalArray<compression_cache::ZSTDCachedData> per_core_uncompr_;
 };
 
 CompressionContextCache::CompressionContextCache() : rep_(new Rep()) {}