From eba122dbe5adc3bc348d1f47b207feaf49c13806 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Wed, 11 Aug 2021 11:38:07 +0800
Subject: [PATCH] test/crimson: 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>
---
 src/test/crimson/gtest_seastar.cc   | 2 +-
 src/test/crimson/test_async_echo.cc | 5 +++--
 src/test/crimson/test_config.cc     | 3 ++-
 src/test/crimson/test_messenger.cc  | 1 +
 src/test/crimson/test_monc.cc       | 4 +++-
 src/test/crimson/test_socket.cc     | 2 ++
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/test/crimson/gtest_seastar.cc b/src/test/crimson/gtest_seastar.cc
index 4411213af90..2fd5e39fab8 100644
--- a/src/test/crimson/gtest_seastar.cc
+++ b/src/test/crimson/gtest_seastar.cc
@@ -22,7 +22,7 @@ int main(int argc, char **argv)
 
   seastar_test_suite_t::seastar_env.run([] {
     return crimson::common::sharded_conf().start(
-      EntityName{}, string_view{"ceph"}
+      EntityName{}, std::string_view{"ceph"}
     ).then([] {
       return crimson::common::sharded_perf_coll().start();
     });
diff --git a/src/test/crimson/test_async_echo.cc b/src/test/crimson/test_async_echo.cc
index 4f2d43d9d29..62ad8daed04 100644
--- a/src/test/crimson/test_async_echo.cc
+++ b/src/test/crimson/test_async_echo.cc
@@ -33,7 +33,7 @@ struct Server {
     msgr->set_require_authorizer(false);
   }
   DummyAuthClientServer dummy_auth;
-  unique_ptr<Messenger> msgr;
+  std::unique_ptr<Messenger> msgr;
   struct ServerDispatcher : Dispatcher {
     std::mutex mutex;
     std::condition_variable on_reply;
@@ -79,7 +79,7 @@ struct Server {
 };
 
 struct Client {
-  unique_ptr<Messenger> msgr;
+  std::unique_ptr<Messenger> msgr;
   Client(CephContext *cct)
     : dummy_auth(cct), dispatcher(cct)
   {
@@ -126,6 +126,7 @@ struct Client {
       return true;
     }
     bool ping(Messenger* msgr, const entity_inst_t& peer) {
+      using namespace std::chrono_literals;
       auto conn = msgr->connect_to(peer.name.type(),
                                    entity_addrvec_t{peer.addr});
       replied = false;
diff --git a/src/test/crimson/test_config.cc b/src/test/crimson/test_config.cc
index 608aa26942c..7541c093125 100644
--- a/src/test/crimson/test_config.cc
+++ b/src/test/crimson/test_config.cc
@@ -7,6 +7,7 @@
 #include "common/config_obs.h"
 #include "crimson/common/config_proxy.h"
 
+using namespace std::literals;
 using Config = crimson::common::ConfigProxy;
 const std::string test_uint_option = "osd_max_pgls";
 const uint64_t INVALID_VALUE = (uint64_t)(-1);
@@ -47,7 +48,7 @@ seastar::sharded<ConfigObs> sharded_cobs;
 
 static seastar::future<> test_config()
 {
-  return crimson::common::sharded_conf().start(EntityName{}, string_view{"ceph"}).then([] {
+  return crimson::common::sharded_conf().start(EntityName{}, "ceph"sv).then([] {
     std::vector<const char*> args;
     std::string cluster;
     std::string conf_file_list;
diff --git a/src/test/crimson/test_messenger.cc b/src/test/crimson/test_messenger.cc
index 57388394596..bd549d4d616 100644
--- a/src/test/crimson/test_messenger.cc
+++ b/src/test/crimson/test_messenger.cc
@@ -29,6 +29,7 @@
 
 #include "test_cmds.h"
 
+using namespace std::chrono_literals;
 namespace bpo = boost::program_options;
 using crimson::common::local_conf;
 
diff --git a/src/test/crimson/test_monc.cc b/src/test/crimson/test_monc.cc
index f590ce73a14..6331f4d61a2 100644
--- a/src/test/crimson/test_monc.cc
+++ b/src/test/crimson/test_monc.cc
@@ -22,9 +22,11 @@ DummyAuthHandler dummy_handler;
 
 }
 
+using namespace std::literals;
+
 static seastar::future<> test_monc()
 {
-  return crimson::common::sharded_conf().start(EntityName{}, string_view{"ceph"}).then([] {
+  return crimson::common::sharded_conf().start(EntityName{}, "ceph"sv).then([] {
     std::vector<const char*> args;
     std::string cluster;
     std::string conf_file_list;
diff --git a/src/test/crimson/test_socket.cc b/src/test/crimson/test_socket.cc
index bfdeeea2a78..49d6aef7d64 100644
--- a/src/test/crimson/test_socket.cc
+++ b/src/test/crimson/test_socket.cc
@@ -15,6 +15,8 @@
 
 namespace {
 
+using namespace std::chrono_literals;
+
 using seastar::engine;
 using seastar::future;
 using crimson::net::error;
-- 
2.39.5