]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
messages: Update MMgrOpen.h to work without using namespace
authorAdam C. Emerson <aemerson@redhat.com>
Fri, 29 Mar 2019 00:51:48 +0000 (20:51 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Fri, 29 Mar 2019 14:30:36 +0000 (10:30 -0400)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/messages/MMgrOpen.h

index 754daf7d340abdfe65100c9f390911743bdb71da..5d5983abe80f3b527122d53deb62426b3be8d298 100644 (file)
@@ -35,13 +35,14 @@ public:
   std::map<std::string,std::string> daemon_status;
 
   // encode map<string,map<int32_t,string>> of current config
-  bufferlist config_bl;
+  ceph::buffer::list config_bl;
 
   // encode map<string,string> of compiled-in defaults
-  bufferlist config_defaults_bl;
+  ceph::buffer::list config_defaults_bl;
 
   void decode_payload() override
   {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(daemon_name, p);
     if (header.version >= 2) {
@@ -72,7 +73,7 @@ public:
   }
 
   std::string_view get_type_name() const override { return "mgropen"; }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << get_type_name() << "(";
     if (service_name.length()) {
       out << service_name;