erasure-code: Update shec to work without using namespace

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

diff --git a/src/erasure-code/shec/ErasureCodePluginShec.cc b/src/erasure-code/shec/ErasureCodePluginShec.cc
index b0ecf3f02b1c615819d05adcdf05bb24139ef313..3eab48f90edb904a42e73e89d466ff0222daecce 100644 (file)
--- a/src/erasure-code/shec/ErasureCodePluginShec.cc
+++ b/src/erasure-code/shec/ErasureCodePluginShec.cc
@@ -31,15 +31,15 @@
 #undef dout_prefix
 #define dout_prefix _prefix(_dout)
 
-static ostream& _prefix(std::ostream* _dout)
+static std::ostream& _prefix(std::ostream* _dout)
 {
   return *_dout << "ErasureCodePluginShec: ";
 }
 
 int ErasureCodePluginShec::factory(const std::string &directory,
-                     ErasureCodeProfile &profile,
-                     ErasureCodeInterfaceRef *erasure_code,
-                     std::ostream *ss) {
+                                  ceph::ErasureCodeProfile &profile,
+                                  ceph::ErasureCodeInterfaceRef *erasure_code,
+                                  std::ostream *ss) {
     ErasureCodeShec *interface;
 
     if (profile.find("technique") == profile.end())
@@ -61,7 +61,7 @@ int ErasureCodePluginShec::factory(const std::string &directory,
       delete interface;
       return r;
     }
-    *erasure_code = ErasureCodeInterfaceRef(interface);
+    *erasure_code = ceph::ErasureCodeInterfaceRef(interface);
 
     dout(10) << "ErasureCodePluginShec: factory() completed" << dendl;
 
@@ -72,7 +72,7 @@ const char *__erasure_code_version() { return CEPH_GIT_NICE_VER; }
 
 int __erasure_code_init(char *plugin_name, char *directory = (char *)"")
 {
-  ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
+  auto& instance = ceph::ErasureCodePluginRegistry::instance();
   int w[] = { 8, 16, 32 };
   int r = jerasure_init(3, w);
   if (r) {

diff --git a/src/erasure-code/shec/ErasureCodePluginShec.h b/src/erasure-code/shec/ErasureCodePluginShec.h
index 72b59a466b21af2d65352d527d5480bfac7f8ccb..b73e49b4635e6370519c22e908b685be6ff5ee6e 100644 (file)
--- a/src/erasure-code/shec/ErasureCodePluginShec.h
+++ b/src/erasure-code/shec/ErasureCodePluginShec.h
@@ -21,14 +21,14 @@
 #include "ErasureCodeShecTableCache.h"
 #include "erasure-code/ErasureCodePlugin.h"
 
-class ErasureCodePluginShec : public ErasureCodePlugin {
+class ErasureCodePluginShec : public ceph::ErasureCodePlugin {
 public:
   ErasureCodeShecTableCache tcache;
 
   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

diff --git a/src/erasure-code/shec/ErasureCodeShec.cc b/src/erasure-code/shec/ErasureCodeShec.cc
index 75bbe97d38d2b85369f73ee508f1770edf0655d8..9ec8dcc47c5ca4d3c277160c42f54b7d1aaf4396 100644 (file)
--- a/src/erasure-code/shec/ErasureCodeShec.cc
+++ b/src/erasure-code/shec/ErasureCodeShec.cc
@@ -18,13 +18,11 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
 #include <algorithm>
-using namespace std;
-
 #include "common/debug.h"
 #include "ErasureCodeShec.h"
 extern "C" {
@@ -40,6 +38,10 @@ extern int* reed_sol_vandermonde_coding_matrix(int k, int m, int w);
 #undef dout_prefix
 #define dout_prefix _prefix(_dout)
 
+using namespace std;
+using namespace ceph;
+
+
 static ostream& _prefix(std::ostream* _dout)
 {
   return *_dout << "ErasureCodeShec: ";

diff --git a/src/erasure-code/shec/ErasureCodeShec.h b/src/erasure-code/shec/ErasureCodeShec.h
index b53eb538ffa34d114d3f7d9334c1d48604508746..44a0778854fe6be6b35cb0b2d0c6e7d94a85cfad 100644 (file)
--- a/src/erasure-code/shec/ErasureCodeShec.h
+++ b/src/erasure-code/shec/ErasureCodeShec.h
@@ -24,7 +24,7 @@
 #include "erasure-code/ErasureCode.h"
 #include "ErasureCodeShecTableCache.h"
 
-class ErasureCodeShec : public ErasureCode {
+class ErasureCodeShec : public ceph::ErasureCode {
 
 public:
   enum {
@@ -75,24 +75,24 @@ public:
                         const std::set<int> &available_chunks,
                         std::set<int> *minimum);
 
-  int minimum_to_decode_with_cost(const set<int> &want_to_read,
-                                         const map<int, int> &available,
-                                         set<int> *minimum) override;
+  int minimum_to_decode_with_cost(const std::set<int> &want_to_read,
+                                 const std::map<int, int> &available,
+                                 std::set<int> *minimum) override;
 
-  int encode(const set<int> &want_to_encode,
-                    const bufferlist &in,
-                    map<int, bufferlist> *encoded) override;
-  int encode_chunks(const set<int> &want_to_encode,
-                           map<int, bufferlist> *encoded) override;
+  int encode(const std::set<int> &want_to_encode,
+                    const ceph::buffer::list &in,
+                    std::map<int, ceph::buffer::list> *encoded) override;
+  int encode_chunks(const std::set<int> &want_to_encode,
+                           std::map<int, ceph::buffer::list> *encoded) override;
 
   int _decode(const std::set<int> &want_to_read,
-             const std::map<int, bufferlist> &chunks,
-             std::map<int, bufferlist> *decoded) override;
-  int decode_chunks(const set<int> &want_to_read,
-                           const map<int, bufferlist> &chunks,
-                           map<int, bufferlist> *decoded) override;
+             const std::map<int, ceph::buffer::list> &chunks,
+             std::map<int, ceph::buffer::list> *decoded) override;
+  int decode_chunks(const std::set<int> &want_to_read,
+                   const std::map<int, ceph::buffer::list> &chunks,
+                   std::map<int, ceph::buffer::list> *decoded) override;
 
-  int init(ErasureCodeProfile &profile, ostream *ss) override;
+  int init(ceph::ErasureCodeProfile &profile, std::ostream *ss) override;
   virtual void shec_encode(char **data,
                           char **coding,
                           int blocksize) = 0;
@@ -109,7 +109,7 @@ public:
   virtual int* shec_reedsolomon_coding_matrix(int is_single);
 
 private:
-  virtual int parse(const ErasureCodeProfile &profile) = 0;
+  virtual int parse(const ceph::ErasureCodeProfile &profile) = 0;
 
   virtual double shec_calc_recovery_efficiency1(int k, int m1, int m2, int c1, int c2);
   virtual int shec_make_decoding_matrix(bool prepare,
@@ -141,7 +141,7 @@ public:
   unsigned get_alignment() const override;
   void prepare() override;
 private:
-  int parse(const ErasureCodeProfile &profile) override;
+  int parse(const ceph::ErasureCodeProfile &profile) override;
 };
 
 #endif