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

erasure-code: Update lrc to work without using namespace

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

diff --git a/src/erasure-code/lrc/ErasureCodeLrc.cc b/src/erasure-code/lrc/ErasureCodeLrc.cc
index c882f868fc1e..b44eec469efc 100644
--- a/src/erasure-code/lrc/ErasureCodeLrc.cc
+++ b/src/erasure-code/lrc/ErasureCodeLrc.cc
@@ -15,7 +15,7 @@
  *
  */
 
-#include <errno.h>
+#include <cerrno>
 #include <algorithm>
 
 #include "include/str_map.h"
@@ -28,15 +28,13 @@
 
 #include "ErasureCodeLrc.h"
 
-// re-include our assert to clobber boost's
-#include "include/ceph_assert.h"
-
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_osd
 #undef dout_prefix
 #define dout_prefix _prefix(_dout)
 
 using namespace std;
+using namespace ceph;
 
 static ostream& _prefix(std::ostream* _dout)
 {
diff --git a/src/erasure-code/lrc/ErasureCodeLrc.h b/src/erasure-code/lrc/ErasureCodeLrc.h
index f1addd913f38..e5b0915ba86d 100644
--- a/src/erasure-code/lrc/ErasureCodeLrc.h
+++ b/src/erasure-code/lrc/ErasureCodeLrc.h
@@ -44,19 +44,19 @@
 #define ERROR_LRC_K_MODULO		-(MAX_ERRNO + 20)
 #define ERROR_LRC_M_MODULO		-(MAX_ERRNO + 21)
 
-class ErasureCodeLrc final : public ErasureCode {
+class ErasureCodeLrc final : public ceph::ErasureCode {
 public:
   static const std::string DEFAULT_KML;
 
   struct Layer {
     explicit Layer(const std::string &_chunks_map) : chunks_map(_chunks_map) { }
-    ErasureCodeInterfaceRef erasure_code;
+    ceph::ErasureCodeInterfaceRef erasure_code;
     std::vector<int> data;
     std::vector<int> coding;
     std::vector<int> chunks;
     std::set<int> chunks_as_set;
     std::string chunks_map;
-    ErasureCodeProfile profile;
+    ceph::ErasureCodeProfile profile;
   };
   std::vector<Layer> layers;
   std::string directory;
@@ -106,25 +106,25 @@ public:
   unsigned int get_chunk_size(unsigned int object_size) const override;
 
   int encode_chunks(const std::set<int> &want_to_encode,
-			    std::map<int, bufferlist> *encoded) override;
+		    std::map<int, ceph::buffer::list> *encoded) override;
 
   int decode_chunks(const std::set<int> &want_to_read,
-			    const std::map<int, bufferlist> &chunks,
-			    std::map<int, bufferlist> *decoded) override;
+		    const std::map<int, ceph::buffer::list> &chunks,
+		    std::map<int, ceph::buffer::list> *decoded) override;
 
-  int init(ErasureCodeProfile &profile, std::ostream *ss) override;
+  int init(ceph::ErasureCodeProfile &profile, std::ostream *ss) override;
 
-  virtual int parse(ErasureCodeProfile &profile, std::ostream *ss);
+  virtual int parse(ceph::ErasureCodeProfile &profile, std::ostream *ss);
 
-  int parse_kml(ErasureCodeProfile &profile, std::ostream *ss);
+  int parse_kml(ceph::ErasureCodeProfile &profile, std::ostream *ss);
 
-  int parse_rule(ErasureCodeProfile &profile, std::ostream *ss);
+  int parse_rule(ceph::ErasureCodeProfile &profile, std::ostream *ss);
 
   int parse_rule_step(const std::string &description_string,
 		      json_spirit::mArray description,
 		      std::ostream *ss);
 
-  int layers_description(const ErasureCodeProfile &profile,
+  int layers_description(const ceph::ErasureCodeProfile &profile,
 			 json_spirit::mArray *description,
 			 std::ostream *ss) const;
   int layers_parse(const std::string &description_string,
diff --git a/src/erasure-code/lrc/ErasureCodePluginLrc.cc b/src/erasure-code/lrc/ErasureCodePluginLrc.cc
index 1731148ba6e3..f80dde17675f 100644
--- a/src/erasure-code/lrc/ErasureCodePluginLrc.cc
+++ b/src/erasure-code/lrc/ErasureCodePluginLrc.cc
@@ -25,9 +25,9 @@
 #define dout_prefix _prefix(_dout)
 
 int ErasureCodePluginLrc::factory(const std::string &directory,
-		      ErasureCodeProfile &profile,
-		      ErasureCodeInterfaceRef *erasure_code,
-		      std::ostream *ss) {
+				  ceph::ErasureCodeProfile &profile,
+				  ceph::ErasureCodeInterfaceRef *erasure_code,
+				  std::ostream *ss) {
     ErasureCodeLrc *interface;
     interface = new ErasureCodeLrc(directory);
     int r = interface->init(profile, ss);
@@ -35,7 +35,7 @@ int ErasureCodePluginLrc::factory(const std::string &directory,
       delete interface;
       return r;
     }
-    *erasure_code = ErasureCodeInterfaceRef(interface);
+    *erasure_code = ceph::ErasureCodeInterfaceRef(interface);
     return 0;
 };
 
@@ -43,6 +43,6 @@ const char *__erasure_code_version() { return CEPH_GIT_NICE_VER; }
 
 int __erasure_code_init(char *plugin_name, char *directory)
 {
-  ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
+  auto& instance = ceph::ErasureCodePluginRegistry::instance();
   return instance.add(plugin_name, new ErasureCodePluginLrc());
 }
diff --git a/src/erasure-code/lrc/ErasureCodePluginLrc.h b/src/erasure-code/lrc/ErasureCodePluginLrc.h
index 0d38f8c701f9..23b415bb7d42 100644
--- a/src/erasure-code/lrc/ErasureCodePluginLrc.h
+++ b/src/erasure-code/lrc/ErasureCodePluginLrc.h
@@ -20,12 +20,12 @@
 
 #include "erasure-code/ErasureCodePlugin.h"
 
-class ErasureCodePluginLrc : public ErasureCodePlugin {
+class ErasureCodePluginLrc : public ceph::ErasureCodePlugin {
 public:
   int factory(const std::string &directory,
-		      ErasureCodeProfile &profile,
-		      ErasureCodeInterfaceRef *erasure_code,
-		      ostream *ss) override;
+	      ceph::ErasureCodeProfile &profile,
+	      ceph::ErasureCodeInterfaceRef *erasure_code,
+	      std::ostream *ss) override;
 };
 
 #endif