From d4b49135084ad0f4b126d8f2df86a9d72ea216b7 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 21:04:36 -0400 Subject: [PATCH] include: Update compact_set.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/include/compact_set.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/compact_set.h b/src/include/compact_set.h index ba743fb0e1c..7a9c0336f0a 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 -inline void encode(const compact_set_base& m, bufferlist& bl) { +inline void encode(const compact_set_base& m, ceph::buffer::list& bl) { m.encode(bl); } template -inline void decode(compact_set_base& m, bufferlist::const_iterator& p) { +inline void decode(compact_set_base& m, ceph::buffer::list::const_iterator& p) { m.decode(p); } -- 2.39.5