From f968379aec6c5d5016dfe5890f9925ce788a04b9 Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Thu, 28 Mar 2019 21:05:35 -0400
Subject: [PATCH] include: Update CompatSet.h to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/include/CompatSet.h | 14 +++++++-------
 src/include/btree_map.h | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/include/CompatSet.h b/src/include/CompatSet.h
index a9e15f76f5d..3439cc82ff6 100644
--- a/src/include/CompatSet.h
+++ b/src/include/CompatSet.h
@@ -77,7 +77,7 @@ struct CompatSet {
       remove(f.id);
     }
 
-    void encode(bufferlist& bl) const {
+    void encode(ceph::buffer::list& bl) const {
       using ceph::encode;
       /* See below, mask always has the lowest bit set in memory, but
        * unset in the encoding */
@@ -85,7 +85,7 @@ struct CompatSet {
       encode(names, bl);
     }
 
-    void decode(bufferlist::const_iterator& bl) {
+    void decode(ceph::buffer::list::const_iterator& bl) {
       using ceph::decode;
       decode(mask, bl);
       decode(names, bl);
@@ -111,7 +111,7 @@ struct CompatSet {
       }
     }
 
-    void dump(Formatter *f) const {
+    void dump(ceph::Formatter *f) const {
       for (auto p = names.cbegin(); p != names.cend(); ++p) {
 	char s[18];
 	snprintf(s, sizeof(s), "feature_%llu", (unsigned long long)p->first);
@@ -222,19 +222,19 @@ struct CompatSet {
     return true;
   }
 
-  void encode(bufferlist& bl) const {
+  void encode(ceph::buffer::list& bl) const {
     compat.encode(bl);
     ro_compat.encode(bl);
     incompat.encode(bl);
   }
-  
-  void decode(bufferlist::const_iterator& bl) {
+
+  void decode(ceph::buffer::list::const_iterator& bl) {
     compat.decode(bl);
     ro_compat.decode(bl);
     incompat.decode(bl);
   }
 
-  void dump(Formatter *f) const {
+  void dump(ceph::Formatter *f) const {
     f->open_object_section("compat");
     compat.dump(f);
     f->close_section();
diff --git a/src/include/btree_map.h b/src/include/btree_map.h
index 1f42ea41414..218835a0fbc 100644
--- a/src/include/btree_map.h
+++ b/src/include/btree_map.h
@@ -10,8 +10,9 @@
 #include "include/encoding.h"
 
 template<class T, class U>
-inline void encode(const btree::btree_map<T,U>& m, bufferlist& bl)
+inline void encode(const btree::btree_map<T,U>& m, ceph::buffer::list& bl)
 {
+  using ceph::encode;
   __u32 n = (__u32)(m.size());
   encode(n, bl);
   for (typename btree::btree_map<T,U>::const_iterator p = m.begin(); p != m.end(); ++p) {
@@ -20,8 +21,9 @@ inline void encode(const btree::btree_map<T,U>& m, bufferlist& bl)
   }
 }
 template<class T, class U>
-inline void encode(const btree::btree_map<T,U>& m, bufferlist& bl, uint64_t features)
+inline void encode(const btree::btree_map<T,U>& m, ceph::buffer::list& bl, uint64_t features)
 {
+  using ceph::encode;
   __u32 n = (__u32)(m.size());
   encode(n, bl);
   for (typename btree::btree_map<T,U>::const_iterator p = m.begin(); p != m.end(); ++p) {
@@ -30,8 +32,9 @@ inline void encode(const btree::btree_map<T,U>& m, bufferlist& bl, uint64_t feat
   }
 }
 template<class T, class U>
-inline void decode(btree::btree_map<T,U>& m, bufferlist::const_iterator& p)
+inline void decode(btree::btree_map<T,U>& m, ceph::buffer::list::const_iterator& p)
 {
+  using ceph::decode;
   __u32 n;
   decode(n, p);
   m.clear();
@@ -42,16 +45,18 @@ inline void decode(btree::btree_map<T,U>& m, bufferlist::const_iterator& p)
   }
 }
 template<class T, class U>
-inline void encode_nohead(const btree::btree_map<T,U>& m, bufferlist& bl)
+inline void encode_nohead(const btree::btree_map<T,U>& m, ceph::buffer::list& bl)
 {
+  using ceph::encode;
   for (typename btree::btree_map<T,U>::const_iterator p = m.begin(); p != m.end(); ++p) {
     encode(p->first, bl);
     encode(p->second, bl);
   }
 }
 template<class T, class U>
-inline void decode_nohead(int n, btree::btree_map<T,U>& m, bufferlist::const_iterator& p)
+inline void decode_nohead(int n, btree::btree_map<T,U>& m, ceph::buffer::list::const_iterator& p)
 {
+  using ceph::decode;
   m.clear();
   while (n--) {
     T k;
-- 
2.39.5