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

erasure-code: Update ErasureCode to work without using namespace

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

diff --git a/src/erasure-code/ErasureCode.cc b/src/erasure-code/ErasureCode.cc
index 3fdf5491364..39389baaf42 100644
--- a/src/erasure-code/ErasureCode.cc
+++ b/src/erasure-code/ErasureCode.cc
@@ -15,8 +15,8 @@
  * 
  */
 
-#include <errno.h>
 #include <algorithm>
+#include <cerrno>
 
 #include "ErasureCode.h"
 
@@ -28,6 +28,17 @@
 #define DEFAULT_RULE_ROOT "default"
 #define DEFAULT_RULE_FAILURE_DOMAIN "host"
 
+using std::make_pair;
+using std::map;
+using std::ostream;
+using std::pair;
+using std::set;
+using std::string;
+using std::vector;
+
+using ceph::bufferlist;
+
+namespace ceph {
 const unsigned ErasureCode::SIMD_ALIGN = 32;
 
 int ErasureCode::init(
@@ -348,3 +359,4 @@ int ErasureCode::decode_concat(const map<int, bufferlist> &chunks,
   }
   return r;
 }
+}
diff --git a/src/erasure-code/ErasureCode.h b/src/erasure-code/ErasureCode.h
index 85ebf66f04e..7e17a845f1a 100644
--- a/src/erasure-code/ErasureCode.h
+++ b/src/erasure-code/ErasureCode.h
@@ -40,7 +40,7 @@ namespace ceph {
 
     ~ErasureCode() override {}
 
-    int init(ErasureCodeProfile &profile, std::ostream *ss) override;
+    int init(ceph::ErasureCodeProfile &profile, std::ostream *ss) override;
 
     const ErasureCodeProfile &get_profile() const override {
       return _profile;