From: Sage Weil <sage@redhat.com>
Date: Wed, 30 Dec 2015 20:04:08 +0000 (-0500)
Subject: include/compact_map: featureful encoders, too
X-Git-Tag: v10.1.0~241^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bdae5bf37ce0ecad157265e6b3c4a76f7e0e8403;p=ceph.git

include/compact_map: featureful encoders, too

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/include/compact_map.h b/src/include/compact_map.h
index a530c27130d..12ba8b3504a 100644
--- a/src/include/compact_map.h
+++ b/src/include/compact_map.h
@@ -284,6 +284,12 @@ public:
     else
       ::encode((uint32_t)0, bl);
   }
+  void encode(bufferlist &bl, uint64_t features) const {
+    if (map)
+      ::encode(*map, bl, features);
+    else
+      ::encode((uint32_t)0, bl);
+  }
   void decode(bufferlist::iterator& p) {
     uint32_t n;
     ::decode(n, p);
@@ -300,6 +306,11 @@ inline void encode(const compact_map_base<Key, T, Map>& m, bufferlist& bl) {
   m.encode(bl);
 }
 template<class Key, class T, class Map>
+inline void encode(const compact_map_base<Key, T, Map>& m, bufferlist& bl,
+		   uint64_t features) {
+  m.encode(bl, features);
+}
+template<class Key, class T, class Map>
 inline void decode(compact_map_base<Key, T, Map>& m, bufferlist::iterator& p) {
   m.decode(p);
 }