From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 3 Mar 2021 19:05:24 +0000 (-0500)
Subject: json: encoding for flat_set accepts all template params
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4171c44a5add47358248d59d24134182eab09b6c;p=ceph.git

json: encoding for flat_set accepts all template params

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/common/ceph_json.h b/src/common/ceph_json.h
index f33f293e246b0..08e8d9e466233 100644
--- a/src/common/ceph_json.h
+++ b/src/common/ceph_json.h
@@ -220,8 +220,8 @@ void decode_json_obj(std::set<T>& l, JSONObj *obj)
   }
 }
 
-template<class T>
-void decode_json_obj(boost::container::flat_set<T>& l, JSONObj *obj)
+template<class T, class Compare, class Alloc>
+void decode_json_obj(boost::container::flat_set<T, Compare, Alloc>& l, JSONObj *obj)
 {
   l.clear();
 
@@ -560,9 +560,9 @@ static void encode_json(const char *name, const std::set<T, Compare>& l, ceph::F
   f->close_section();
 }
 
-template<class T, class Compare = std::less<T> >
+template<class T, class Compare, class Alloc>
 static void encode_json(const char *name,
-                        const boost::container::flat_set<T, Compare>& l,
+                        const boost::container::flat_set<T, Compare, Alloc>& l,
                         ceph::Formatter *f)
 {
   f->open_array_section(name);