From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 29 Mar 2019 01:04:36 +0000 (-0400)
Subject: include: Update compact_set.h to work without using namespace
X-Git-Tag: v15.0.0~19^2~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4b49135084ad0f4b126d8f2df86a9d72ea216b7;p=ceph.git

include: Update compact_set.h to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/include/compact_set.h b/src/include/compact_set.h
index ba743fb0e1cd..7a9c0336f0a9 100644
--- a/src/include/compact_set.h
+++ b/src/include/compact_set.h
@@ -258,14 +258,14 @@ public:
       return const_iterator(this);
     return const_iterator(this, set->upper_bound(t));
   }
-  void encode(bufferlist &bl) const {
+  void encode(ceph::buffer::list &bl) const {
     using ceph::encode;
     if (set)
       encode(*set, bl);
     else
       encode((uint32_t)0, bl);
   }
-  void decode(bufferlist::const_iterator& p) {
+  void decode(ceph::buffer::list::const_iterator& p) {
     using ceph::decode;
     uint32_t n;
     decode(n, p);
@@ -278,11 +278,11 @@ public:
 };
 
 template<class T, class Set>
-inline void encode(const compact_set_base<T, Set>& m, bufferlist& bl) {
+inline void encode(const compact_set_base<T, Set>& m, ceph::buffer::list& bl) {
   m.encode(bl);
 }
 template<class T, class Set>
-inline void decode(compact_set_base<T, Set>& m, bufferlist::const_iterator& p) {
+inline void decode(compact_set_base<T, Set>& m, ceph::buffer::list::const_iterator& p) {
   m.decode(p);
 }