erasure-code: Update jerasure to work without using namespace

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

diff --git a/src/erasure-code/jerasure/ErasureCodeJerasure.cc b/src/erasure-code/jerasure/ErasureCodeJerasure.cc
index fee779047f9107f39db20722c40d7dcb4c195399..1c996582d38aa07b3d96093668750c0ebb5815b2 100644 (file)
--- a/src/erasure-code/jerasure/ErasureCodeJerasure.cc
+++ b/src/erasure-code/jerasure/ErasureCodeJerasure.cc
@@ -34,6 +34,13 @@ extern "C" {
 #undef dout_prefix
 #define dout_prefix _prefix(_dout)
 
+using std::ostream;
+using std::map;
+using std::set;
+
+using ceph::bufferlist;
+using ceph::ErasureCodeProfile;
+
 static ostream& _prefix(std::ostream* _dout)
 {
   return *_dout << "ErasureCodeJerasure: ";

diff --git a/src/erasure-code/jerasure/ErasureCodeJerasure.h b/src/erasure-code/jerasure/ErasureCodeJerasure.h
index 0b5bfb1c8a94e058d546030f58b1a727b0f96fab..6af798697acbaa0baa699c44d385ce3bcd380f9c 100644 (file)
--- a/src/erasure-code/jerasure/ErasureCodeJerasure.h
+++ b/src/erasure-code/jerasure/ErasureCodeJerasure.h
@@ -20,7 +20,7 @@
 
 #include "erasure-code/ErasureCode.h"
 
-class ErasureCodeJerasure : public ErasureCode {
+class ErasureCodeJerasure : public ceph::ErasureCode {
 public:
   int k;
   std::string DEFAULT_K;
@@ -57,13 +57,13 @@ 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 void jerasure_encode(char **data,
                                char **coding,
@@ -76,9 +76,8 @@ public:
   virtual void prepare() = 0;
   static bool is_prime(int value);
 protected:
-  virtual int parse(ErasureCodeProfile &profile, std::ostream *ss);
+  virtual int parse(ceph::ErasureCodeProfile &profile, std::ostream *ss);
 };
-
 class ErasureCodeJerasureReedSolomonVandermonde : public ErasureCodeJerasure {
 public:
   int *matrix;
@@ -106,7 +105,7 @@ public:
   unsigned get_alignment() const override;
   void prepare() override;
 private:
-  int parse(ErasureCodeProfile &profile, std::ostream *ss) override;
+  int parse(ceph::ErasureCodeProfile& profile, std::ostream *ss) override;
 };
 
 class ErasureCodeJerasureReedSolomonRAID6 : public ErasureCodeJerasure {
@@ -135,7 +134,7 @@ public:
   unsigned get_alignment() const override;
   void prepare() override;
 private:
-  int parse(ErasureCodeProfile &profile, std::ostream *ss) override;
+  int parse(ceph::ErasureCodeProfile& profile, std::ostream *ss) override;
 };
 
 #define DEFAULT_PACKETSIZE "2048"
@@ -168,7 +167,7 @@ public:
   unsigned get_alignment() const override;
   void prepare_schedule(int *matrix);
 private:
-  int parse(ErasureCodeProfile &profile, std::ostream *ss) override;
+  int parse(ceph::ErasureCodeProfile& profile, std::ostream *ss) override;
 };
 
 class ErasureCodeJerasureCauchyOrig : public ErasureCodeJerasureCauchy {
@@ -219,11 +218,11 @@ public:
   virtual bool check_w(std::ostream *ss) const;
   virtual bool check_packetsize_set(std::ostream *ss) const;
   virtual bool check_packetsize(std::ostream *ss) const;
-  virtual int revert_to_default(ErasureCodeProfile &profile,
+  virtual int revert_to_default(ceph::ErasureCodeProfile& profile,
                                std::ostream *ss);
   void prepare() override;
 private:
-  int parse(ErasureCodeProfile &profile, std::ostream *ss) override;
+  int parse(ceph::ErasureCodeProfile& profile, std::ostream *ss) override;
 };
 
 class ErasureCodeJerasureBlaumRoth : public ErasureCodeJerasureLiberation {
@@ -249,7 +248,7 @@ public:
 
   void prepare() override;
 private:
-  int parse(ErasureCodeProfile &profile, std::ostream *ss) override;
+  int parse(ceph::ErasureCodeProfile& profile, std::ostream *ss) override;
 };
 
 #endif

diff --git a/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc b/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc
index 353b71b804edda9547f3b8d4bd108e887915b007..90c7b5e4ac2cd0f0f13be86b0167c72c55b43c4c 100644 (file)
--- a/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc
+++ b/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc
@@ -26,15 +26,15 @@
 #undef dout_prefix
 #define dout_prefix _prefix(_dout)
 
-static ostream& _prefix(std::ostream* _dout)
+static std::ostream& _prefix(std::ostream* _dout)
 {
   return *_dout << "ErasureCodePluginJerasure: ";
 }
 
 int ErasureCodePluginJerasure::factory(const std::string& directory,
-                     ErasureCodeProfile &profile,
-                     ErasureCodeInterfaceRef *erasure_code,
-                     std::ostream *ss) {
+                                      ceph::ErasureCodeProfile &profile,
+                                      ceph::ErasureCodeInterfaceRef *erasure_code,
+                                      std::ostream *ss) {
     ErasureCodeJerasure *interface;
     std::string t;
     if (profile.find("technique") != profile.end())
@@ -66,7 +66,7 @@ int ErasureCodePluginJerasure::factory(const std::string& directory,
       delete interface;
       return r;
     }
-    *erasure_code = ErasureCodeInterfaceRef(interface);
+    *erasure_code = ceph::ErasureCodeInterfaceRef(interface);
     return 0;
 }
 
@@ -74,7 +74,7 @@ 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();
   int w[] = { 4, 8, 16, 32 };
   int r = jerasure_init(4, w);
   if (r) {

diff --git a/src/erasure-code/jerasure/ErasureCodePluginJerasure.h b/src/erasure-code/jerasure/ErasureCodePluginJerasure.h
index 9b5dc2f4c52e04ce4922e50acabaf87684d8c8db..1140b3753d78a432fa5fee3efe26ad5dcb9d804f 100644 (file)
--- a/src/erasure-code/jerasure/ErasureCodePluginJerasure.h
+++ b/src/erasure-code/jerasure/ErasureCodePluginJerasure.h
@@ -20,12 +20,12 @@
 
 #include "erasure-code/ErasureCodePlugin.h"
 
-class ErasureCodePluginJerasure : public ErasureCodePlugin {
+class ErasureCodePluginJerasure : 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