test/erasure-code: build without "using namespace std"

* add "std::" prefix in headers
* add "using" declarations in .cc files.

so we don't rely on "using namespace std" in one or more included
headers.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/test/erasure-code/ErasureCodeExample.h b/src/test/erasure-code/ErasureCodeExample.h
index 1258465388a62517ae05acb5d020ba4467fe1aff..1185b38d73685d32bc9b1b25de01e3e9905b8d29 100644 (file)
--- a/src/test/erasure-code/ErasureCodeExample.h
+++ b/src/test/erasure-code/ErasureCodeExample.h
@@ -35,20 +35,22 @@
 
 #define MINIMUM_TO_RECOVER 2u
 
+using namespace std;
+
 class ErasureCodeExample final : public ErasureCode {
 public:
   ~ErasureCodeExample() override {}
 
-  int create_rule(const string &name,
+  int create_rule(const std::string &name,
                             CrushWrapper &crush,
                             ostream *ss) const override {
     return crush.add_simple_rule(name, "default", "host", "",
                                 "indep", pg_pool_t::TYPE_ERASURE, ss);
   }
 
-  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 {
     //
     // If one chunk is more expensive to fetch than the others,
     // recover it instead. For instance, if the cost reflects the
@@ -56,7 +58,7 @@ public:
     // OSD and if CPU is cheap, it could make sense to recover
     // instead of fetching the chunk.
     //
-    map<int, int> c2c(available);
+    std::map<int, int> c2c(available);
     if (c2c.size() > DATA_CHUNKS) {
       if (c2c[FIRST_DATA_CHUNK] > c2c[SECOND_DATA_CHUNK] &&
          c2c[FIRST_DATA_CHUNK] > c2c[CODING_CHUNK])
@@ -69,7 +71,7 @@ public:
        c2c.erase(CODING_CHUNK);
     }
     set <int> available_chunks;
-    for (map<int, int>::const_iterator i = c2c.begin();
+    for (std::map<int, int>::const_iterator i = c2c.begin();
         i != c2c.end();
         ++i)
       available_chunks.insert(i->first);
@@ -88,9 +90,9 @@ public:
     return ( object_size / DATA_CHUNKS ) + 1;
   }
 
-  int encode(const set<int> &want_to_encode,
+  int encode(const std::set<int> &want_to_encode,
                      const bufferlist &in,
-                     map<int, bufferlist> *encoded) override {
+                     std::map<int, bufferlist> *encoded) override {
     //
     // make sure all data chunks have the same length, allocating
     // padding if necessary.
@@ -126,20 +128,20 @@ public:
     return 0;
   }
 
-  int encode_chunks(const set<int> &want_to_encode,
-                           map<int, bufferlist> *encoded) override {
+  int encode_chunks(const std::set<int> &want_to_encode,
+                           std::map<int, bufferlist> *encoded) override {
     ceph_abort();
     return 0;
   }
 
-  int _decode(const set<int> &want_to_read,
-             const map<int, bufferlist> &chunks,
-             map<int, bufferlist> *decoded) {
+  int _decode(const std::set<int> &want_to_read,
+             const std::map<int, bufferlist> &chunks,
+             std::map<int, bufferlist> *decoded) {
     //
     // All chunks have the same size
     //
     unsigned chunk_length = (*chunks.begin()).second.length();
-    for (set<int>::iterator i = want_to_read.begin();
+    for (std::set<int>::iterator i = want_to_read.begin();
          i != want_to_read.end();
          ++i) {
       if (chunks.find(*i) != chunks.end()) {
@@ -159,7 +161,7 @@ public:
        // No matter what the missing chunk is, XOR of the other
        // two recovers it.
        //
-        map<int, bufferlist>::const_iterator k = chunks.begin();
+        std::map<int, bufferlist>::const_iterator k = chunks.begin();
         const char *a = k->second.front().c_str();
         ++k;
         const char *b = k->second.front().c_str();
@@ -178,15 +180,15 @@ public:
     return 0;
   }
 
-  int decode_chunks(const set<int> &want_to_read,
-                           const map<int, bufferlist> &chunks,
-                           map<int, bufferlist> *decoded) override {
+  int decode_chunks(const std::set<int> &want_to_read,
+                           const std::map<int, bufferlist> &chunks,
+                           std::map<int, bufferlist> *decoded) override {
     ceph_abort();
     return 0;
   }
 
-  const vector<int> &get_chunk_mapping() const override {
-    static vector<int> mapping;
+  const std::vector<int> &get_chunk_mapping() const override {
+    static std::vector<int> mapping;
     return mapping;
   }
 

diff --git a/src/test/erasure-code/ErasureCodePluginExample.cc b/src/test/erasure-code/ErasureCodePluginExample.cc
index de105953a47a789b5c7aea01d979900c2b46875e..697b77d94f54684c32cd52e1b55f7b9f7d832d79 100644 (file)
--- a/src/test/erasure-code/ErasureCodePluginExample.cc
+++ b/src/test/erasure-code/ErasureCodePluginExample.cc
@@ -21,6 +21,8 @@
 #include "erasure-code/ErasureCodePlugin.h"
 #include "ErasureCodeExample.h"
 
+using namespace std;
+
 class ErasureCodePluginExample : public ErasureCodePlugin {
 public:
   int factory(const std::string &directory,

diff --git a/src/test/erasure-code/TestErasureCode.cc b/src/test/erasure-code/TestErasureCode.cc
index 98d5bb2edf98e03413e1c7aa1343c75bcb8ef402..05b95ded4029881fae675bbae8b86c8f976e8af4 100644 (file)
--- a/src/test/erasure-code/TestErasureCode.cc
+++ b/src/test/erasure-code/TestErasureCode.cc
@@ -22,6 +22,8 @@
 #include "common/config.h"
 #include "gtest/gtest.h"
 
+using namespace std;
+
 class ErasureCodeTest : public ErasureCode {
 public:
   map<int, bufferlist> encode_chunks_encoded;

diff --git a/src/test/erasure-code/TestErasureCodeClay.cc b/src/test/erasure-code/TestErasureCodeClay.cc
index 3d7abddf62148c8d3f08f3b3632c5c79d0f9e48f..cb47409489436ff9ce20674ac77a539982304515 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeClay.cc
+++ b/src/test/erasure-code/TestErasureCodeClay.cc
@@ -24,6 +24,8 @@
 #include "common/config_proxy.h"
 #include "gtest/gtest.h"
 
+using namespace std;
+
 TEST(ErasureCodeClay, sanity_check_k)
 {
   ErasureCodeClay clay(g_conf().get_val<std::string>("erasure_code_dir"));

diff --git a/src/test/erasure-code/TestErasureCodeIsa.cc b/src/test/erasure-code/TestErasureCodeIsa.cc
index 9a9476c95d7f30aff056f3ec0fc3cbf104f3deed..bbd4441fc7290826bb4f878624b4f9d81682a532 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeIsa.cc
+++ b/src/test/erasure-code/TestErasureCodeIsa.cc
@@ -26,6 +26,8 @@
 #include "common/config.h"
 #include "gtest/gtest.h"
 
+using namespace std;
+
 ErasureCodeIsaTableCache tcache;
 
 class IsaErasureCodeTest : public ::testing::Test {

diff --git a/src/test/erasure-code/TestErasureCodeJerasure.cc b/src/test/erasure-code/TestErasureCodeJerasure.cc
index 03c233fe8fdc45b0ddb259a74b5d26958106acaa..835f3c7b6c8f8d15b945328d95e9d7b56cd351a5 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeJerasure.cc
+++ b/src/test/erasure-code/TestErasureCodeJerasure.cc
@@ -25,6 +25,7 @@
 #include "common/config.h"
 #include "gtest/gtest.h"
 
+using namespace std;
 
 template <typename T>
 class ErasureCodeTest : public ::testing::Test {

diff --git a/src/test/erasure-code/TestErasureCodeLrc.cc b/src/test/erasure-code/TestErasureCodeLrc.cc
index 79385f33944ec0e92b6b41f33d3968ad2dc49221..aca6ccae91f6961a2372937f541107acc10f8a7e 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeLrc.cc
+++ b/src/test/erasure-code/TestErasureCodeLrc.cc
@@ -25,6 +25,7 @@
 #include "common/config_proxy.h"
 #include "gtest/gtest.h"
 
+using namespace std;
 
 TEST(ErasureCodeLrc, parse_rule)
 {

diff --git a/src/test/erasure-code/TestErasureCodePlugin.cc b/src/test/erasure-code/TestErasureCodePlugin.cc
index c00d2997fbd5287b9e2462282e7ea5757f592b7c..e396d946789ae70456dea541318733c9336a5048 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePlugin.cc
+++ b/src/test/erasure-code/TestErasureCodePlugin.cc
@@ -24,6 +24,7 @@
 #include "common/config_proxy.h"
 #include "gtest/gtest.h"
 
+using namespace std;
 
 class ErasureCodePluginRegistryTest : public ::testing::Test {};
 

diff --git a/src/test/erasure-code/TestErasureCodePluginClay.cc b/src/test/erasure-code/TestErasureCodePluginClay.cc
index c9297a49fc8ed64e0462bf9523315fc8a96131a8..cbf6566dd733dbb7427d1b32cd944c6c70f32d53 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePluginClay.cc
+++ b/src/test/erasure-code/TestErasureCodePluginClay.cc
@@ -22,6 +22,8 @@
 #include "common/config_proxy.h"
 #include "gtest/gtest.h"
 
+using namespace std;
+
 TEST(ErasureCodePlugin, factory)
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();

diff --git a/src/test/erasure-code/TestErasureCodePluginIsa.cc b/src/test/erasure-code/TestErasureCodePluginIsa.cc
index b57bf489654682f088ed63240cf0da1f88ee3ef6..86bac636dcc664542d3e24bfef7bf3f987c53484 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePluginIsa.cc
+++ b/src/test/erasure-code/TestErasureCodePluginIsa.cc
@@ -21,6 +21,8 @@
 #include "common/config_proxy.h"
 #include "gtest/gtest.h"
 
+using namespace std;
+
 TEST(ErasureCodePlugin, factory)
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();

diff --git a/src/test/erasure-code/TestErasureCodePluginJerasure.cc b/src/test/erasure-code/TestErasureCodePluginJerasure.cc
index 0010d0206705de47c7e379f9aab78918aab06f9c..ffe4183bff13ee873d805a718cc3d203427a757c 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePluginJerasure.cc
+++ b/src/test/erasure-code/TestErasureCodePluginJerasure.cc
@@ -23,6 +23,8 @@
 #include "common/config_proxy.h"
 #include "gtest/gtest.h"
 
+using namespace std;
+
 TEST(ErasureCodePlugin, factory)
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();

diff --git a/src/test/erasure-code/TestErasureCodePluginLrc.cc b/src/test/erasure-code/TestErasureCodePluginLrc.cc
index 4df3711a1f186ab1805ee6b4c37d31047d8242d0..9be2c336dc5d671369285b656341032e01c46703 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePluginLrc.cc
+++ b/src/test/erasure-code/TestErasureCodePluginLrc.cc
@@ -24,6 +24,7 @@
 #include "common/config_proxy.h"
 #include "gtest/gtest.h"
 
+using namespace std;
 
 TEST(ErasureCodePlugin, factory)
 {

diff --git a/src/test/erasure-code/TestErasureCodePluginShec.cc b/src/test/erasure-code/TestErasureCodePluginShec.cc
index 10088343b0a7889eb81c450e0a6a6b64028bc781..fae1b559e93fdacd0e4141b532764c2c599f9ce1 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePluginShec.cc
+++ b/src/test/erasure-code/TestErasureCodePluginShec.cc
@@ -23,6 +23,8 @@
 #include "gtest/gtest.h"
 #include "common/config_proxy.h"
 
+using namespace std;
+
 TEST(ErasureCodePlugin, factory)
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();

diff --git a/src/test/erasure-code/TestErasureCodeShec.cc b/src/test/erasure-code/TestErasureCodeShec.cc
index 9bc6b8f10dd9e9dff23bc92dfc43fd60acf2cf92..6b901dc6f30c7f0c4e55de0cdcfa46a76fcd1c06 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeShec.cc
+++ b/src/test/erasure-code/TestErasureCodeShec.cc
@@ -30,6 +30,8 @@
 #include "global/global_context.h"
 #include "gtest/gtest.h"
 
+using namespace std;
+
 void* thread1(void* pParam);
 void* thread2(void* pParam);
 void* thread3(void* pParam);

diff --git a/src/test/erasure-code/TestErasureCodeShec_all.cc b/src/test/erasure-code/TestErasureCodeShec_all.cc
index 81a5ac4b077a931415d84e09b5ed4c8e6e2f9e03..9ee648aac124aef1a43cf6d9ed141b5e272e8d9c 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeShec_all.cc
+++ b/src/test/erasure-code/TestErasureCodeShec_all.cc
@@ -31,6 +31,8 @@
 #include "global/global_context.h"
 #include "gtest/gtest.h"
 
+using namespace std;
+
 struct Param_d {
   char* k;
   char* m;

diff --git a/src/test/erasure-code/TestErasureCodeShec_arguments.cc b/src/test/erasure-code/TestErasureCodeShec_arguments.cc
index 561afafa6cd298d577347f706ba121c0dc98a468..8e3c52a19c09981d485788a316894c4f2783affa 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeShec_arguments.cc
+++ b/src/test/erasure-code/TestErasureCodeShec_arguments.cc
@@ -31,6 +31,8 @@
 #include "global/global_context.h"
 #include "gtest/gtest.h"
 
+using namespace std;
+
 unsigned int count_num = 0;
 unsigned int unexpected_count = 0;
 unsigned int value_count = 0;

diff --git a/src/test/erasure-code/TestErasureCodeShec_thread.cc b/src/test/erasure-code/TestErasureCodeShec_thread.cc
index c3e6d8eb308f6885d953c5859010e3c77d8c15f0..c8d7bbb1e9ab790fbedc5631af970b6fb4069814 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeShec_thread.cc
+++ b/src/test/erasure-code/TestErasureCodeShec_thread.cc
@@ -30,6 +30,8 @@
 #include "global/global_context.h"
 #include "gtest/gtest.h"
 
+using namespace std;
+
 void* thread1(void* pParam);
 
 class TestParam {