update ceph source to reef 18.1.2

[ceph.git] / ceph / src / compressor / Compressor.cc

diff --git a/ceph/src/compressor/Compressor.cc b/ceph/src/compressor/Compressor.cc
index fa0f052f69b15445f8637434015f9ed39db4dff0..43d34c8eb01e4991bd2c996302563d69a0276681 100644 (file)
--- a/ceph/src/compressor/Compressor.cc
+++ b/ceph/src/compressor/Compressor.cc
@@ -26,6 +26,10 @@
 
 namespace TOPNSPC {
 
+#ifdef HAVE_QATZIP
+  QatAccel Compressor::qat_accel;
+#endif
+
 const char* Compressor::get_comp_alg_name(int a) {
 
   auto p = std::find_if(std::cbegin(compression_algorithms), std::cend(compression_algorithms),
@@ -37,7 +41,7 @@ const char* Compressor::get_comp_alg_name(int a) {
   return p->first;
 }
 
-boost::optional<Compressor::CompressionAlgorithm>
+std::optional<Compressor::CompressionAlgorithm>
 Compressor::get_comp_alg_type(std::string_view s) {
 
   auto p = std::find_if(std::cbegin(compression_algorithms), std::cend(compression_algorithms),
@@ -57,7 +61,7 @@ const char *Compressor::get_comp_mode_name(int m) {
     default: return "???";
   }
 }
-boost::optional<Compressor::CompressionMode>
+std::optional<Compressor::CompressionMode>
 Compressor::get_comp_mode_type(std::string_view s) {
   if (s == "force")
     return COMP_FORCE;
@@ -67,7 +71,7 @@ Compressor::get_comp_mode_type(std::string_view s) {
     return COMP_PASSIVE;
   if (s == "none")
     return COMP_NONE;
-  return boost::optional<CompressionMode>();
+  return {};
 }
 
 CompressorRef Compressor::create(CephContext *cct, const std::string &type)