From 1069bc461baaf4b12d2e3a927dd9730da15e88e9 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 21:03:57 -0400 Subject: [PATCH] include: Update health.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/include/health.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/include/health.h b/src/include/health.h index 5c00225ee9381..515ddb552c4f1 100644 --- a/src/include/health.h +++ b/src/include/health.h @@ -15,12 +15,12 @@ enum health_status_t { HEALTH_OK = 2, }; -inline void encode(health_status_t hs, bufferlist& bl) { +inline void encode(health_status_t hs, ceph::buffer::list& bl) { using ceph::encode; uint8_t v = hs; encode(v, bl); } -inline void decode(health_status_t& hs, bufferlist::const_iterator& p) { +inline void decode(health_status_t& hs, ceph::buffer::list::const_iterator& p) { using ceph::decode; uint8_t v; decode(v, p); @@ -32,21 +32,21 @@ struct denc_traits { static constexpr bool featured = false; static constexpr bool bounded = true; static constexpr bool need_contiguous = false; - static void bound_encode(const bufferptr& v, size_t& p, uint64_t f=0) { + static void bound_encode(const ceph::buffer::ptr& v, size_t& p, uint64_t f=0) { p++; } static void encode(const health_status_t& v, - buffer::list::contiguous_appender& p, + ceph::buffer::list::contiguous_appender& p, uint64_t f=0) { ::denc((uint8_t)v, p); } - static void decode(health_status_t& v, buffer::ptr::const_iterator& p, + static void decode(health_status_t& v, ceph::buffer::ptr::const_iterator& p, uint64_t f=0) { uint8_t tmp; ::denc(tmp, p); v = health_status_t(tmp); } - static void decode(health_status_t& v, buffer::list::const_iterator& p, + static void decode(health_status_t& v, ceph::buffer::list::const_iterator& p, uint64_t f=0) { uint8_t tmp; ::denc(tmp, p); -- 2.39.5