mds: use std::variant instead of boost::variant

Resolves: ISCE-2037

Signed-off-by: Igor Golikov <igolikov@redhat.com>
(cherry picked from commit 479eae30dfab1563bb0163f3fff9eb671a09ff08)

diff --git a/src/include/cephfs/metrics/Types.h b/src/include/cephfs/metrics/Types.h
index bcf70a86f8888da6f8194fd846bc2d19dc938b04..ae06bf55bd966c2b4b5c89e94e3557f8a79b44f7 100644 (file)
--- a/src/include/cephfs/metrics/Types.h
+++ b/src/include/cephfs/metrics/Types.h
@@ -5,7 +5,7 @@
 #define CEPH_INCLUDE_CEPHFS_METRICS_TYPES_H
 
 #include <string>
-#include <boost/variant.hpp>
+#include <variant>
 
 #include "common/Formatter.h"
 #include "include/buffer_fwd.h"
@@ -828,7 +828,7 @@ struct SubvolumeMetricsPayload : public ClientMetricPayloadBase {
   }
 };
 
-typedef boost::variant<CapInfoPayload,
+typedef std::variant<CapInfoPayload,
         ReadLatencyPayload,
         WriteLatencyPayload,
         MetadataLatencyPayload,
@@ -849,7 +849,7 @@ public:
     : payload(payload) {
   }
 
-  class EncodePayloadVisitor : public boost::static_visitor<void> {
+  class EncodePayloadVisitor {
   public:
     explicit EncodePayloadVisitor(bufferlist &bl) : m_bl(bl) {
     }
@@ -865,7 +865,7 @@ public:
     bufferlist &m_bl;
   };
 
-  class DecodePayloadVisitor : public boost::static_visitor<void> {
+  class DecodePayloadVisitor {
   public:
     DecodePayloadVisitor(bufferlist::const_iterator &iter) : m_iter(iter) {
     }
@@ -880,7 +880,7 @@ public:
     bufferlist::const_iterator &m_iter;
   };
 
-  class DumpPayloadVisitor : public boost::static_visitor<void> {
+  class DumpPayloadVisitor {
   public:
     explicit DumpPayloadVisitor(Formatter *formatter) : m_formatter(formatter) {
     }
@@ -895,7 +895,7 @@ public:
     Formatter *m_formatter;
   };
 
-  class PrintPayloadVisitor : public boost::static_visitor<void> {
+  class PrintPayloadVisitor {
   public:
     explicit PrintPayloadVisitor(std::ostream *out) : _out(out) {
     }
@@ -914,7 +914,7 @@ public:
   };
 
   void encode(bufferlist &bl) const {
-    boost::apply_visitor(EncodePayloadVisitor(bl), payload);
+    std::visit(EncodePayloadVisitor(bl), payload);
   }
 
   void decode(bufferlist::const_iterator &iter) {
@@ -965,11 +965,11 @@ public:
       break;
     }
 
-    boost::apply_visitor(DecodePayloadVisitor(iter), payload);
+    std::visit(DecodePayloadVisitor(iter), payload);
   }
 
   void dump(Formatter *f) const {
-    apply_visitor(DumpPayloadVisitor(f), payload);
+    std::visit(DumpPayloadVisitor(f), payload);
   }
 
   static void generate_test_instances(std::list<ClientMetricMessage*>& ls) {
@@ -977,7 +977,7 @@ public:
   }
 
   void print(std::ostream *out) const {
-    apply_visitor(PrintPayloadVisitor(out), payload);
+    std::visit(PrintPayloadVisitor(out), payload);
   }
 
   ClientMetricPayload payload;