]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
include: Update health.h to work without using namespace
authorAdam C. Emerson <aemerson@redhat.com>
Fri, 29 Mar 2019 01:03:57 +0000 (21:03 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Fri, 29 Mar 2019 14:30:37 +0000 (10:30 -0400)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/include/health.h

index 5c00225ee9381b790c3f17de6c0b8ec80963a19d..515ddb552c4f18e5aff653470e6d7a1293cf677a 100644 (file)
@@ -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<health_status_t> {
   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);