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

erasure-code: Update clay to work without using namespace

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

diff --git a/src/erasure-code/clay/ErasureCodeClay.cc b/src/erasure-code/clay/ErasureCodeClay.cc
index 7ff28c1d5541..26854bce82b8 100644
--- a/src/erasure-code/clay/ErasureCodeClay.cc
+++ b/src/erasure-code/clay/ErasureCodeClay.cc
@@ -36,7 +36,7 @@
 #define talloc(type, num) (type *) malloc(sizeof(type)*(num))
 
 using namespace std;
-
+using namespace ceph;
 static ostream& _prefix(std::ostream* _dout)
 {
   return *_dout << "ErasureCodeClay: ";
diff --git a/src/erasure-code/clay/ErasureCodePluginClay.cc b/src/erasure-code/clay/ErasureCodePluginClay.cc
index cb1473519931..35694da0cb03 100644
--- a/src/erasure-code/clay/ErasureCodePluginClay.cc
+++ b/src/erasure-code/clay/ErasureCodePluginClay.cc
@@ -24,14 +24,14 @@
 #define dout_prefix _prefix(_dout)
 
 int ErasureCodePluginClay::factory(const std::string &directory,
-		      ErasureCodeProfile &profile,
-		      ErasureCodeInterfaceRef *erasure_code,
-		      std::ostream *ss) {
+				   ceph::ErasureCodeProfile &profile,
+				   ceph::ErasureCodeInterfaceRef *erasure_code,
+				   std::ostream *ss) {
   auto interface = std::make_unique<ErasureCodeClay>(directory);
   if (int r = interface->init(profile, ss); r) {
     return r;
   }
-  *erasure_code = ErasureCodeInterfaceRef(interface.release());
+  *erasure_code = ceph::ErasureCodeInterfaceRef(interface.release());
   return 0;
 };
 
@@ -39,6 +39,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 ErasureCodePluginClay());
 }
diff --git a/src/erasure-code/clay/ErasureCodePluginClay.h b/src/erasure-code/clay/ErasureCodePluginClay.h
index 6efaa198df3e..393643f2796d 100644
--- a/src/erasure-code/clay/ErasureCodePluginClay.h
+++ b/src/erasure-code/clay/ErasureCodePluginClay.h
@@ -19,12 +19,12 @@
 
 #include "erasure-code/ErasureCodePlugin.h"
 
-class ErasureCodePluginClay : public ErasureCodePlugin {
+class ErasureCodePluginClay : 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