From ac87c3dc0aa78b537c1b82b34290ecc2c24eaa98 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 9 Aug 2021 19:12:05 +0800
Subject: [PATCH] crimson: build without "using namespace std"

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

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

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/crimson/admin/admin_socket.cc              |  5 +++++
 src/crimson/admin/osd_admin.cc                 | 11 ++++++-----
 src/crimson/mon/MonClient.cc                   |  4 ++++
 src/crimson/mon/MonClient.h                    |  2 +-
 src/crimson/net/Connection.h                   |  8 ++++----
 src/crimson/net/Interceptor.h                  |  6 ++++--
 src/crimson/net/Messenger.h                    |  4 ++--
 src/crimson/net/SocketConnection.cc            |  1 +
 src/crimson/net/SocketConnection.h             |  2 +-
 src/crimson/net/SocketMessenger.h              |  2 +-
 src/crimson/os/alienstore/alien_store.cc       |  4 ++++
 src/crimson/os/cyanstore/cyan_collection.cc    |  2 ++
 src/crimson/os/cyanstore/cyan_store.cc         |  1 +
 src/crimson/os/cyanstore/cyan_store.h          |  2 +-
 src/crimson/os/seastore/cache.cc               |  2 ++
 src/crimson/os/seastore/seastore.cc            |  1 +
 src/crimson/os/seastore/seastore.h             |  2 +-
 src/crimson/osd/heartbeat.cc                   |  4 +++-
 src/crimson/osd/main.cc                        |  1 +
 src/crimson/osd/objclass.cc                    |  3 +++
 src/crimson/osd/osd.cc                         |  7 +++++++
 src/crimson/osd/osd_meta.cc                    |  1 +
 src/crimson/osd/osdmap_gate.cc                 |  2 +-
 src/crimson/osd/pg.cc                          |  5 +++++
 src/crimson/osd/pg.h                           | 12 ++++++------
 src/crimson/osd/pg_backend.cc                  |  3 +++
 src/crimson/osd/pg_map.cc                      |  2 ++
 src/crimson/osd/pg_meta.cc                     |  2 ++
 src/crimson/osd/pg_recovery.cc                 |  3 +++
 src/crimson/osd/pg_recovery.h                  |  2 +-
 src/crimson/osd/replicated_recovery_backend.cc |  4 ++++
 src/crimson/osd/replicated_recovery_backend.h  |  2 +-
 src/crimson/osd/shard_services.cc              |  2 ++
 src/crimson/osd/shard_services.h               |  8 ++++----
 34 files changed, 90 insertions(+), 32 deletions(-)

diff --git a/src/crimson/admin/admin_socket.cc b/src/crimson/admin/admin_socket.cc
index 58710e3beef40..1593123eb0079 100644
--- a/src/crimson/admin/admin_socket.cc
+++ b/src/crimson/admin/admin_socket.cc
@@ -29,6 +29,11 @@ seastar::logger& logger()
 }
 }  // namespace
 
+using std::string;
+using std::string_view;
+using std::stringstream;
+using std::unique_ptr;
+
 namespace crimson::admin {
 
 tell_result_t::tell_result_t(int ret, std::string&& err)
diff --git a/src/crimson/admin/osd_admin.cc b/src/crimson/admin/osd_admin.cc
index 5c4ffdd2a7e3c..e832045883477 100644
--- a/src/crimson/admin/osd_admin.cc
+++ b/src/crimson/admin/osd_admin.cc
@@ -17,9 +17,6 @@
 #include "crimson/osd/exceptions.h"
 #include "crimson/osd/osd.h"
 
-using crimson::osd::OSD;
-using namespace crimson::common;
-
 namespace {
 seastar::logger& logger()
 {
@@ -27,9 +24,13 @@ seastar::logger& logger()
 }
 }  // namespace
 
-namespace crimson::admin {
-
+using std::string_view;
+using std::unique_ptr;
+using crimson::osd::OSD;
 using crimson::common::local_conf;
+using namespace crimson::common;
+
+namespace crimson::admin {
 
 template <class Hook, class... Args>
 std::unique_ptr<AdminSocketHook> make_asok_hook(Args&&... args)
diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index 8ad6e74b01afb..0e8e73a058102 100644
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -35,6 +35,10 @@
 #include "messages/MMonSubscribe.h"
 #include "messages/MMonSubscribeAck.h"
 
+using std::string;
+using std::tuple;
+using std::vector;
+
 namespace {
   seastar::logger& logger()
   {
diff --git a/src/crimson/mon/MonClient.h b/src/crimson/mon/MonClient.h
index 4648c7310c575..7ad14696c9085 100644
--- a/src/crimson/mon/MonClient.h
+++ b/src/crimson/mon/MonClient.h
@@ -70,7 +70,7 @@ class Client : public crimson::net::Dispatcher,
 
   ceph_tid_t last_mon_command_id = 0;
   using command_result_t =
-    seastar::future<std::tuple<std::int32_t, string, ceph::bufferlist>>;
+    seastar::future<std::tuple<std::int32_t, std::string, ceph::bufferlist>>;
   struct mon_command_t {
     ceph::ref_t<MMonCommand> req;
     typename command_result_t::promise_type result;
diff --git a/src/crimson/net/Connection.h b/src/crimson/net/Connection.h
index a494a6baacbc0..e715d059a5eee 100644
--- a/src/crimson/net/Connection.h
+++ b/src/crimson/net/Connection.h
@@ -136,7 +136,7 @@ class Connection : public seastar::enable_shared_from_this<Connection> {
   // without dispatching any reset event
   virtual void mark_down() = 0;
 
-  virtual void print(ostream& out) const = 0;
+  virtual void print(std::ostream& out) const = 0;
 
   void set_last_keepalive(clock_t::time_point when) {
     last_keepalive = when;
@@ -151,12 +151,12 @@ class Connection : public seastar::enable_shared_from_this<Connection> {
     virtual ~user_private_t() = default;
   };
 private:
-  unique_ptr<user_private_t> user_private;
+  std::unique_ptr<user_private_t> user_private;
 public:
   bool has_user_private() const {
     return user_private != nullptr;
   }
-  void set_user_private(unique_ptr<user_private_t> new_user_private) {
+  void set_user_private(std::unique_ptr<user_private_t> new_user_private) {
     user_private = std::move(new_user_private);
   }
   user_private_t &get_user_private() {
@@ -165,7 +165,7 @@ public:
   }
 };
 
-inline ostream& operator<<(ostream& out, const Connection& conn) {
+inline std::ostream& operator<<(std::ostream& out, const Connection& conn) {
   out << "[";
   conn.print(out);
   out << "]";
diff --git a/src/crimson/net/Interceptor.h b/src/crimson/net/Interceptor.h
index dfa2183ec03a8..8f34dc3b7c829 100644
--- a/src/crimson/net/Interceptor.h
+++ b/src/crimson/net/Interceptor.h
@@ -62,7 +62,8 @@ class socket_blocker {
       return seastar::make_ready_future<>();
     } else {
       p_blocked = seastar::abort_source();
-      return seastar::sleep_abortable(10s, *p_blocked).then([] {
+      return seastar::sleep_abortable(std::chrono::seconds(10),
+				      *p_blocked).then([] {
         throw std::runtime_error(
             "Timeout (10s) in socket_blocker::wait_blocked()");
       }).handle_exception_type([] (const seastar::sleep_aborted& e) {
@@ -78,7 +79,8 @@ class socket_blocker {
     }
     ceph_assert(!p_unblocked);
     p_unblocked = seastar::abort_source();
-    return seastar::sleep_abortable(10s, *p_unblocked).then([] {
+    return seastar::sleep_abortable(std::chrono::seconds(10),
+				    *p_unblocked).then([] {
       ceph_abort("Timeout (10s) in socket_blocker::block()");
     }).handle_exception_type([] (const seastar::sleep_aborted& e) {
       // wait done!
diff --git a/src/crimson/net/Messenger.h b/src/crimson/net/Messenger.h
index 2b39fbf63a668..179a752b746e1 100644
--- a/src/crimson/net/Messenger.h
+++ b/src/crimson/net/Messenger.h
@@ -118,7 +118,7 @@ public:
     auth_server = as;
   }
 
-  virtual void print(ostream& out) const = 0;
+  virtual void print(std::ostream& out) const = 0;
 
   virtual SocketPolicy get_policy(entity_type_t peer_type) const = 0;
 
@@ -144,7 +144,7 @@ public:
          const uint64_t nonce);
 };
 
-inline ostream& operator<<(ostream& out, const Messenger& msgr) {
+inline std::ostream& operator<<(std::ostream& out, const Messenger& msgr) {
   out << "[";
   msgr.print(out);
   out << "]";
diff --git a/src/crimson/net/SocketConnection.cc b/src/crimson/net/SocketConnection.cc
index a119b9a96c673..99abf890454d0 100644
--- a/src/crimson/net/SocketConnection.cc
+++ b/src/crimson/net/SocketConnection.cc
@@ -21,6 +21,7 @@
 #include "Interceptor.h"
 #endif
 
+using std::ostream;
 using namespace crimson::net;
 using crimson::common::local_conf;
 
diff --git a/src/crimson/net/SocketConnection.h b/src/crimson/net/SocketConnection.h
index e2bdc24853d48..4513e338f369a 100644
--- a/src/crimson/net/SocketConnection.h
+++ b/src/crimson/net/SocketConnection.h
@@ -75,7 +75,7 @@ class SocketConnection : public Connection {
 
   void mark_down() override;
 
-  void print(ostream& out) const override;
+  void print(std::ostream& out) const override;
 
   /// start a handshake from the client's perspective,
   /// only call when SocketConnection first construct
diff --git a/src/crimson/net/SocketMessenger.h b/src/crimson/net/SocketMessenger.h
index 9bd3cfc4f7840..0e1a2e98fa6fb 100644
--- a/src/crimson/net/SocketMessenger.h
+++ b/src/crimson/net/SocketMessenger.h
@@ -85,7 +85,7 @@ class SocketMessenger final : public Messenger {
 
   seastar::future<> shutdown() override;
 
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << get_myname()
         << "(" << logic_name
         << ") " << get_myaddr();
diff --git a/src/crimson/os/alienstore/alien_store.cc b/src/crimson/os/alienstore/alien_store.cc
index d05c69ac09644..dc343b3401002 100644
--- a/src/crimson/os/alienstore/alien_store.cc
+++ b/src/crimson/os/alienstore/alien_store.cc
@@ -24,6 +24,10 @@
 #include "crimson/common/log.h"
 #include "crimson/os/futurized_store.h"
 
+using std::map;
+using std::set;
+using std::string;
+
 namespace {
 
 seastar::logger& logger()
diff --git a/src/crimson/os/cyanstore/cyan_collection.cc b/src/crimson/os/cyanstore/cyan_collection.cc
index f44234e845a00..9a814f978d572 100644
--- a/src/crimson/os/cyanstore/cyan_collection.cc
+++ b/src/crimson/os/cyanstore/cyan_collection.cc
@@ -2,6 +2,8 @@
 
 #include "cyan_object.h"
 
+using std::make_pair;
+
 namespace crimson::os
 {
 
diff --git a/src/crimson/os/cyanstore/cyan_store.cc b/src/crimson/os/cyanstore/cyan_store.cc
index 330baab9db4c6..964025234c107 100644
--- a/src/crimson/os/cyanstore/cyan_store.cc
+++ b/src/crimson/os/cyanstore/cyan_store.cc
@@ -21,6 +21,7 @@ namespace {
   }
 }
 
+using std::string;
 using crimson::common::local_conf;
 
 namespace crimson::os {
diff --git a/src/crimson/os/cyanstore/cyan_store.h b/src/crimson/os/cyanstore/cyan_store.h
index 85349b2871492..38f8f6d5ec92d 100644
--- a/src/crimson/os/cyanstore/cyan_store.h
+++ b/src/crimson/os/cyanstore/cyan_store.h
@@ -174,7 +174,7 @@ private:
   int _setattrs(const coll_t& cid, const ghobject_t& oid,
                 std::map<std::string,bufferlist>& aset);
   int _rm_attr(const coll_t& cid, const ghobject_t& oid,
-	       string_view name);
+               std::string_view name);
   int _create_collection(const coll_t& cid, int bits);
   boost::intrusive_ptr<Collection> _get_collection(const coll_t& cid);
 };
diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index b494d142a7650..502a35f3ee7b5 100644
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -16,6 +16,8 @@
 #include "crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h"
 #include "test/crimson/seastore/test_block.h"
 
+using std::string_view;
+
 namespace crimson::os::seastore {
 
 Cache::Cache(SegmentManager &segment_manager) :
diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc
index fb474f483d5dc..ad0df8d0e53b6 100644
--- a/src/crimson/os/seastore/seastore.cc
+++ b/src/crimson/os/seastore/seastore.cc
@@ -27,6 +27,7 @@
 #include "crimson/os/seastore/onode_manager.h"
 #include "crimson/os/seastore/object_data_handler.h"
 
+using std::string;
 using crimson::common::local_conf;
 
 namespace crimson::os::seastore {
diff --git a/src/crimson/os/seastore/seastore.h b/src/crimson/os/seastore/seastore.h
index d38d49d3a6d54..27768fe6ae74c 100644
--- a/src/crimson/os/seastore/seastore.h
+++ b/src/crimson/os/seastore/seastore.h
@@ -266,7 +266,7 @@ private:
   omap_get_values_ret_t omap_list(
     CollectionRef ch,
     const ghobject_t &oid,
-    const std::optional<string> &_start,
+    const std::optional<std::string> &_start,
     OMapManager::omap_list_config_t config);
 
   SegmentManagerRef segment_manager;
diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc
index 53723f0a7444d..2ddeaa9cf1204 100644
--- a/src/crimson/osd/heartbeat.cc
+++ b/src/crimson/osd/heartbeat.cc
@@ -17,6 +17,8 @@
 
 #include "osd/OSDMap.h"
 
+using std::set;
+using std::string;
 using crimson::common::local_conf;
 
 namespace {
@@ -637,7 +639,7 @@ bool Heartbeat::FailingPeers::add_pending(
   if (failure_pending.count(peer)) {
     return false;
   }
-  auto failed_for = chrono::duration_cast<chrono::seconds>(
+  auto failed_for = std::chrono::duration_cast<std::chrono::seconds>(
       now - failed_since).count();
   auto osdmap = heartbeat.service.get_osdmap_service().get_map();
   auto failure_report =
diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 3b714ead8619a..169c2f4540b09 100644
--- a/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@ -30,6 +30,7 @@
 
 namespace bpo = boost::program_options;
 using config_t = crimson::common::ConfigProxy;
+using std::string;
 
 seastar::logger& logger() {
   return crimson::get_logger(ceph_subsys_osd);
diff --git a/src/crimson/osd/objclass.cc b/src/crimson/osd/objclass.cc
index eb1d66ec53dcc..3ed9697173607 100644
--- a/src/crimson/osd/objclass.cc
+++ b/src/crimson/osd/objclass.cc
@@ -18,6 +18,9 @@
 #include "auth/Crypto.h"
 #include "common/armor.h"
 
+using std::map;
+using std::string;
+
 static inline int execute_osd_op(cls_method_context_t hctx, OSDOp& op)
 {
   // we can expect the memory under `ret` will be still fine after
diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index fce209201598c..a7e0cbd149934 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -64,6 +64,13 @@ namespace {
   static constexpr int TICK_INTERVAL = 1;
 }
 
+using std::make_unique;
+using std::map;
+using std::pair;
+using std::string;
+using std::unique_ptr;
+using std::vector;
+
 using crimson::common::local_conf;
 using crimson::os::FuturizedStore;
 
diff --git a/src/crimson/osd/osd_meta.cc b/src/crimson/osd/osd_meta.cc
index 02a7675b433b0..eeea9b57280eb 100644
--- a/src/crimson/osd/osd_meta.cc
+++ b/src/crimson/osd/osd_meta.cc
@@ -10,6 +10,7 @@
 #include "crimson/os/futurized_store.h"
 #include "os/Transaction.h"
 
+using std::string;
 using read_errorator = crimson::os::FuturizedStore::read_errorator;
 
 void OSDMeta::create(ceph::os::Transaction& t)
diff --git a/src/crimson/osd/osdmap_gate.cc b/src/crimson/osd/osdmap_gate.cc
index 90afc32b4e404..4add9388d81ac 100644
--- a/src/crimson/osd/osdmap_gate.cc
+++ b/src/crimson/osd/osdmap_gate.cc
@@ -32,7 +32,7 @@ blocking_future<epoch_t> OSDMapGate::wait_for_map(epoch_t epoch)
   } else {
     logger().info("evt epoch is {}, i have {}, will wait", epoch, current);
     auto &blocker = waiting_peering.emplace(
-      epoch, make_pair(blocker_type, epoch)).first->second;
+      epoch, std::make_pair(blocker_type, epoch)).first->second;
     auto fut = blocker.promise.get_shared_future();
     if (shard_services) {
       return blocker.make_blocking_future(
diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index a5e3251a3d5ad..fbebbc4b8158b 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -37,6 +37,11 @@
 #include "crimson/osd/pg_recovery.h"
 #include "crimson/osd/replicated_recovery_backend.h"
 
+using std::ostream;
+using std::set;
+using std::string;
+using std::vector;
+
 namespace {
   seastar::logger& logger() {
     return crimson::get_logger(ceph_subsys_osd);
diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index b659352af4586..39f645fc91878 100644
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -265,10 +265,10 @@ public:
 	}));
   }
 
-  void update_heartbeat_peers(set<int> peers) final {
+  void update_heartbeat_peers(std::set<int> peers) final {
     // Not needed yet
   }
-  void set_probe_targets(const set<pg_shard_t> &probe_set) final {
+  void set_probe_targets(const std::set<pg_shard_t> &probe_set) final {
     // Not needed yet
   }
   void clear_probe_targets() final {
@@ -655,7 +655,7 @@ public:
   epoch_t get_last_peering_reset() const final {
     return peering_state.get_last_peering_reset();
   }
-  const set<pg_shard_t> &get_acting_recovery_backfill() const {
+  const std::set<pg_shard_t> &get_acting_recovery_backfill() const {
     return peering_state.get_acting_recovery_backfill();
   }
   bool is_backfill_target(pg_shard_t osd) const {
@@ -667,11 +667,11 @@ public:
   uint64_t min_peer_features() const {
     return peering_state.get_min_peer_features();
   }
-  const map<hobject_t, set<pg_shard_t>>&
+  const std::map<hobject_t, std::set<pg_shard_t>>&
   get_missing_loc_shards() const {
     return peering_state.get_missing_loc().get_missing_locs();
   }
-  const map<pg_shard_t, pg_missing_t> &get_shard_missing() const {
+  const std::map<pg_shard_t, pg_missing_t> &get_shard_missing() const {
     return peering_state.get_peer_missing();
   }
   epoch_t get_interval_start_epoch() const {
@@ -751,7 +751,7 @@ private:
 	oid, get_actingset(), v);
   }
   bool is_degraded_or_backfilling_object(const hobject_t& soid) const;
-  const set<pg_shard_t> &get_actingset() const {
+  const std::set<pg_shard_t> &get_actingset() const {
     return peering_state.get_actingset();
   }
 
diff --git a/src/crimson/osd/pg_backend.cc b/src/crimson/osd/pg_backend.cc
index 62f7341c73633..5f2ddfcef6a13 100644
--- a/src/crimson/osd/pg_backend.cc
+++ b/src/crimson/osd/pg_backend.cc
@@ -32,6 +32,9 @@ namespace {
   }
 }
 
+using std::runtime_error;
+using std::string;
+using std::string_view;
 using crimson::common::local_conf;
 
 std::unique_ptr<PGBackend>
diff --git a/src/crimson/osd/pg_map.cc b/src/crimson/osd/pg_map.cc
index 08071f2604fec..6a542aeba1dd9 100644
--- a/src/crimson/osd/pg_map.cc
+++ b/src/crimson/osd/pg_map.cc
@@ -12,6 +12,8 @@ namespace {
   }
 }
 
+using std::make_pair;
+
 namespace crimson::osd {
 
 PGMap::PGCreationState::PGCreationState(spg_t pgid) : pgid(pgid) {}
diff --git a/src/crimson/osd/pg_meta.cc b/src/crimson/osd/pg_meta.cc
index 6ab4c58fd5b29..a0b9b37d6035d 100644
--- a/src/crimson/osd/pg_meta.cc
+++ b/src/crimson/osd/pg_meta.cc
@@ -8,6 +8,8 @@
 #include "crimson/os/futurized_collection.h"
 #include "crimson/os/futurized_store.h"
 
+using std::string;
+using std::string_view;
 // prefix pgmeta_oid keys with _ so that PGLog::read_log_and_missing() can
 // easily skip them
 using crimson::os::FuturizedStore;
diff --git a/src/crimson/osd/pg_recovery.cc b/src/crimson/osd/pg_recovery.cc
index e879cb9ec14c2..e076b1c817fd8 100644
--- a/src/crimson/osd/pg_recovery.cc
+++ b/src/crimson/osd/pg_recovery.cc
@@ -27,6 +27,9 @@ namespace {
   }
 }
 
+using std::map;
+using std::set;
+
 void PGRecovery::start_pglogbased_recovery()
 {
   using PglogBasedRecovery = crimson::osd::PglogBasedRecovery;
diff --git a/src/crimson/osd/pg_recovery.h b/src/crimson/osd/pg_recovery.h
index 7120342dd5837..cdb07cc5c3945 100644
--- a/src/crimson/osd/pg_recovery.h
+++ b/src/crimson/osd/pg_recovery.h
@@ -66,7 +66,7 @@ private:
     const object_stat_sum_t& stat_diff,
     bool is_delete);
   void on_failed_recover(
-    const set<pg_shard_t>& from,
+    const std::set<pg_shard_t>& from,
     const hobject_t& soid,
     const eversion_t& v);
   void on_peer_recover(
diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index 927551d076819..6eccf8d1a11f0 100644
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -18,6 +18,10 @@ namespace {
   }
 }
 
+using std::less;
+using std::map;
+using std::string;
+
 RecoveryBackend::interruptible_future<>
 ReplicatedRecoveryBackend::recover_object(
   const hobject_t& soid,
diff --git a/src/crimson/osd/replicated_recovery_backend.h b/src/crimson/osd/replicated_recovery_backend.h
index 1d9b6042b9b18..f35011a9d4550 100644
--- a/src/crimson/osd/replicated_recovery_backend.h
+++ b/src/crimson/osd/replicated_recovery_backend.h
@@ -83,7 +83,7 @@ protected:
     ceph::bufferlist&& data_included,
     ceph::bufferlist&& omap_header,
     const std::map<std::string, bufferlist, std::less<>> &attrs,
-    std::map<string, bufferlist>&& omap_entries,
+    std::map<std::string, bufferlist>&& omap_entries,
     ceph::os::Transaction *t);
   void submit_push_complete(
     const ObjectRecoveryInfo &recovery_info,
diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc
index 41ea91bcebfc4..1723f775ef9d0 100644
--- a/src/crimson/osd/shard_services.cc
+++ b/src/crimson/osd/shard_services.cc
@@ -23,6 +23,8 @@ namespace {
   }
 }
 
+using std::vector;
+
 namespace crimson::osd {
 
 ShardServices::ShardServices(
diff --git a/src/crimson/osd/shard_services.h b/src/crimson/osd/shard_services.h
index b6b48a254b1b7..faacc196f374d 100644
--- a/src/crimson/osd/shard_services.h
+++ b/src/crimson/osd/shard_services.h
@@ -147,11 +147,11 @@ private:
     std::vector<int> acting;
     bool forced = false;
   };
-  map<pg_t, pg_temp_t> pg_temp_wanted;
-  map<pg_t, pg_temp_t> pg_temp_pending;
+  std::map<pg_t, pg_temp_t> pg_temp_wanted;
+  std::map<pg_t, pg_temp_t> pg_temp_pending;
   friend std::ostream& operator<<(std::ostream&, const pg_temp_t&);
 public:
-  void queue_want_pg_temp(pg_t pgid, const vector<int>& want,
+  void queue_want_pg_temp(pg_t pgid, const std::vector<int>& want,
 			  bool forced = false);
   void remove_want_pg_temp(pg_t pgid);
   void requeue_pg_temp();
@@ -166,7 +166,7 @@ public:
 
   // PG Created State
 private:
-  set<pg_t> pg_created;
+  std::set<pg_t> pg_created;
 public:
   seastar::future<> send_pg_created(pg_t pgid);
   seastar::future<> send_pg_created();
-- 
2.39.5