From: Shinobu Kinjo <shinobu@redhat.com>
Date: Mon, 27 Nov 2017 04:46:58 +0000 (+0900)
Subject: [cleanup] Remove namespace using directives for std
X-Git-Tag: v13.0.1~72^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19159%2Fhead;p=ceph.git

[cleanup] Remove namespace using directives for std

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>
---

diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc
index aac835ed3af32..06d5a291a1496 100644
--- a/src/auth/KeyRing.cc
+++ b/src/auth/KeyRing.cc
@@ -28,8 +28,6 @@
 #undef dout_prefix
 #define dout_prefix *_dout << "auth: "
 
-using namespace std;
-
 int KeyRing::from_ceph_context(CephContext *cct)
 {
   const md_config_t *conf = cct->_conf;
diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index 4416e9d3c588d..cb2715299af16 100644
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -16,7 +16,6 @@
 #include <sys/utsname.h>
 #include <iostream>
 #include <string>
-using namespace std;
 
 #include "common/config.h"
 #include "common/errno.h"
diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index acce67289aff5..536edca41fc05 100644
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -19,7 +19,6 @@
 
 #include <iostream>
 #include <string>
-using namespace std;
 
 #include "include/ceph_features.h"
 #include "include/compat.h"
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 1792facf650cc..9139e8b83ef10 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -18,7 +18,6 @@
 
 #include <iostream>
 #include <string>
-using namespace std;
 
 #include "common/config.h"
 #include "include/ceph_features.h"
diff --git a/src/ceph_syn.cc b/src/ceph_syn.cc
index 2a6419b10fdf5..490a30d6e5b88 100644
--- a/src/ceph_syn.cc
+++ b/src/ceph_syn.cc
@@ -15,7 +15,6 @@
 #include <sys/stat.h>
 #include <iostream>
 #include <string>
-using namespace std;
 
 #include "common/config.h"
 
diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc
index 88574e07a202c..89f8498d88885 100644
--- a/src/client/SyntheticClient.cc
+++ b/src/client/SyntheticClient.cc
@@ -16,7 +16,6 @@
 
 #include <iostream>
 #include <sstream>
-using namespace std;
 
 
 #include "common/config.h"
diff --git a/src/client/barrier.h b/src/client/barrier.h
index 8ed3040fab5a7..f94a48acd05c3 100644
--- a/src/client/barrier.h
+++ b/src/client/barrier.h
@@ -25,7 +25,6 @@ class Client;
 
 typedef boost::icl::interval<uint64_t>::type barrier_interval;
 
-using namespace std;
 
 /*
  * we keep count of uncommitted writes on the inode, so that
diff --git a/src/common/Readahead.cc b/src/common/Readahead.cc
index 9318bbf545ebd..647b7ed2430aa 100644
--- a/src/common/Readahead.cc
+++ b/src/common/Readahead.cc
@@ -3,7 +3,6 @@
 
 #include "Readahead.h"
 
-using namespace std;
 
 Readahead::Readahead()
   : m_trigger_requests(10),
diff --git a/src/common/address_helper.cc b/src/common/address_helper.cc
index 8f625f8db4d1f..09ec805bce27a 100644
--- a/src/common/address_helper.cc
+++ b/src/common/address_helper.cc
@@ -10,7 +10,6 @@
 #include "common/address_helper.h"
 #include "boost/regex.hpp"
 
-using namespace std;
 
 // decode strings like "tcp://<host>:<port>"
 int entity_addr_from_url(entity_addr_t *addr /* out */, const char *url)
diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc
index fa518e2f18a1a..8d524818e89e4 100644
--- a/src/common/blkdev.cc
+++ b/src/common/blkdev.cc
@@ -17,7 +17,6 @@
 #include "include/uuid.h"
 #include "blkdev.h"
 
-using namespace std;
 
 #ifdef __linux__
 #include <linux/fs.h>
diff --git a/src/common/ceph_json.cc b/src/common/ceph_json.cc
index e326fdebcf326..29b551e8fb068 100644
--- a/src/common/ceph_json.cc
+++ b/src/common/ceph_json.cc
@@ -5,7 +5,6 @@
 #include <fstream>
 #include <include/types.h>
 
-using namespace std;
 using namespace json_spirit;
 
 #define dout_subsys ceph_subsys_rgw
diff --git a/src/common/cmdparse.cc b/src/common/cmdparse.cc
index 9a873f5144216..9ce9ff6a54075 100644
--- a/src/common/cmdparse.cc
+++ b/src/common/cmdparse.cc
@@ -15,7 +15,6 @@
 #include "json_spirit/json_spirit.h"
 #include "common/debug.h"
 
-using namespace std;
 
 /**
  * Given a cmddesc like "foo baz name=bar,type=CephString",
diff --git a/src/common/dns_resolve.cc b/src/common/dns_resolve.cc
index 13f06548e84d0..f3594b0041f78 100644
--- a/src/common/dns_resolve.cc
+++ b/src/common/dns_resolve.cc
@@ -20,7 +20,6 @@
 
 #define dout_subsys ceph_subsys_
 
-using namespace std;
 
 namespace ceph {
 
diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index d2fc48586011c..8e4e9336783c2 100644
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -52,7 +52,6 @@ inline static void decode(crush_rule_step &s, bufferlist::iterator &p)
   ::decode(s.arg2, p);
 }
 
-using namespace std;
 class CrushWrapper {
 public:
   // magic value used by OSDMap for a "default" fallback choose_args, used if
diff --git a/src/erasure-code/ErasureCode.cc b/src/erasure-code/ErasureCode.cc
index 855147d954e01..fa5d8e29a4e5b 100644
--- a/src/erasure-code/ErasureCode.cc
+++ b/src/erasure-code/ErasureCode.cc
@@ -25,7 +25,6 @@
 #include "crush/CrushWrapper.h"
 #include "osd/osd_types.h"
 
-using namespace std;
 
 const unsigned ErasureCode::SIMD_ALIGN = 32;
 
diff --git a/src/erasure-code/jerasure/ErasureCodeJerasure.cc b/src/erasure-code/jerasure/ErasureCodeJerasure.cc
index 599073eb3f73e..0369dd87ee5c5 100644
--- a/src/erasure-code/jerasure/ErasureCodeJerasure.cc
+++ b/src/erasure-code/jerasure/ErasureCodeJerasure.cc
@@ -18,7 +18,6 @@
 #include "common/debug.h"
 #include "ErasureCodeJerasure.h"
 
-using namespace std;
 
 extern "C" {
 #include "jerasure.h"
diff --git a/src/include/Distribution.h b/src/include/Distribution.h
index a1be0019cc011..e4f0b30b1299d 100644
--- a/src/include/Distribution.h
+++ b/src/include/Distribution.h
@@ -17,7 +17,6 @@
 #define CEPH_DISTRIBUTION_H
 
 #include <vector>
-using namespace std;
 
 class Distribution {
   vector<float> p;
diff --git a/src/include/filepath.h b/src/include/filepath.h
index b4c33070c9ff2..1e28cffd0a156 100644
--- a/src/include/filepath.h
+++ b/src/include/filepath.h
@@ -26,7 +26,6 @@
 #include <iosfwd>
 #include <string>
 #include <vector>
-using namespace std;
 
 #include "buffer.h"
 #include "encoding.h"
diff --git a/src/include/rangeset.h b/src/include/rangeset.h
index 547af26e2b665..51c1c840551d8 100644
--- a/src/include/rangeset.h
+++ b/src/include/rangeset.h
@@ -23,7 +23,6 @@
  */
 
 #include <map>
-using namespace std;
 
 //typedef int T;
 
diff --git a/src/include/types.h b/src/include/types.h
index c68f9e10ebdca..99fad9ced8ee8 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -59,7 +59,6 @@ extern "C" {
 #include <iostream>
 #include <iomanip>
 
-using namespace std;
 
 #include "include/unordered_map.h"
 
diff --git a/src/key_value_store/kv_flat_btree_async.cc b/src/key_value_store/kv_flat_btree_async.cc
index 5d3c3829531fc..25dc5c1f6b7e6 100644
--- a/src/key_value_store/kv_flat_btree_async.cc
+++ b/src/key_value_store/kv_flat_btree_async.cc
@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <iterator>
 
-using namespace std;
 using ceph::bufferlist;
 
 bool index_data::is_timed_out(utime_t now, utime_t timeout) const {
diff --git a/src/key_value_store/kv_flat_btree_async.h b/src/key_value_store/kv_flat_btree_async.h
index f16ba6d9a99e4..2b3761850e959 100644
--- a/src/key_value_store/kv_flat_btree_async.h
+++ b/src/key_value_store/kv_flat_btree_async.h
@@ -32,7 +32,6 @@
 #include <sstream>
 #include <stdarg.h>
 
-using namespace std;
 using ceph::bufferlist;
 
 enum {
diff --git a/src/key_value_store/kvs_arg_types.h b/src/key_value_store/kvs_arg_types.h
index 4bd32f02aeb35..98063621e38e5 100644
--- a/src/key_value_store/kvs_arg_types.h
+++ b/src/key_value_store/kvs_arg_types.h
@@ -13,7 +13,6 @@
 #include "include/encoding.h"
 #include "key_value_store/kv_flat_btree_async.h"
 
-using namespace std;
 using ceph::bufferlist;
 
 struct assert_size_args {
diff --git a/src/krbd.cc b/src/krbd.cc
index 523c3db1f5f6d..9841135155f7d 100644
--- a/src/krbd.cc
+++ b/src/krbd.cc
@@ -40,7 +40,6 @@
 #include <blkid/blkid.h>
 #include <libudev.h>
 
-using namespace std;
 
 const static int POLL_TIMEOUT=120000;
 
diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index f180fa8c472a8..9fe1fa15e0052 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -102,7 +102,6 @@
 
 #include "perfglue/heap_profiler.h"
 
-using namespace std;
 
 #include "common/config.h"
 #include "include/assert.h"
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index e72d8a7504e35..56f0b86c16d37 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -61,7 +61,6 @@
 
 #include <list>
 #include <iostream>
-using namespace std;
 
 #include "common/config.h"
 
diff --git a/src/mgr/OSDHealthMetricCollector.cc b/src/mgr/OSDHealthMetricCollector.cc
index 0b3d4180d7f48..d86ad07be0637 100644
--- a/src/mgr/OSDHealthMetricCollector.cc
+++ b/src/mgr/OSDHealthMetricCollector.cc
@@ -5,7 +5,6 @@
 #include "OSDHealthMetricCollector.h"
 
 
-using namespace std;
 
 ostream& operator<<(ostream& os,
                     const OSDHealthMetricCollector::DaemonKey& daemon) {
diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h
index 8f3ca30245b02..777f2e80361d3 100644
--- a/src/mon/AuthMonitor.h
+++ b/src/mon/AuthMonitor.h
@@ -17,7 +17,6 @@
 
 #include <map>
 #include <set>
-using namespace std;
 
 #include "include/ceph_features.h"
 #include "include/types.h"
diff --git a/src/mon/Elector.h b/src/mon/Elector.h
index b9e6310b5b881..4c005c965fe99 100644
--- a/src/mon/Elector.h
+++ b/src/mon/Elector.h
@@ -17,7 +17,6 @@
 #define CEPH_MON_ELECTOR_H
 
 #include <map>
-using namespace std;
 
 #include "include/types.h"
 #include "include/Context.h"
diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h
index d2f082596c5e4..7c8043689ec0a 100644
--- a/src/mon/LogMonitor.h
+++ b/src/mon/LogMonitor.h
@@ -17,7 +17,6 @@
 
 #include <map>
 #include <set>
-using namespace std;
 
 #include "include/types.h"
 #include "PaxosService.h"
diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
index 840f4e469a524..c59858a092bcb 100644
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@ -20,7 +20,6 @@
 
 #include <map>
 #include <set>
-using namespace std;
 
 #include "include/types.h"
 #include "mds/FSMap.h"
diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h
index e3e01173b6ee5..57e1fd6dbf222 100644
--- a/src/mon/MonmapMonitor.h
+++ b/src/mon/MonmapMonitor.h
@@ -22,7 +22,6 @@
 #include <map>
 #include <set>
 
-using namespace std;
 
 #include "include/types.h"
 #include "msg/Messenger.h"
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index e2bc85fba628a..96870c0ab77bd 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -23,7 +23,6 @@
 
 #include <map>
 #include <set>
-using namespace std;
 
 #include "include/types.h"
 #include "common/simple_cache.hpp"
diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index fb30526e48ab8..8cc5b8e1fc34b 100644
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -7,7 +7,6 @@
 #endif
 
 #include <iostream>
-using namespace std;
 
 #include "include/types.h"
 
diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index c6dbcc17694d4..eb3541780364b 100644
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -18,7 +18,6 @@
 #define CEPH_MESSENGER_H
 
 #include <map>
-using namespace std;
 
 #include "Message.h"
 #include "Dispatcher.h"
diff --git a/src/msg/async/AsyncConnection.h b/src/msg/async/AsyncConnection.h
index 4ad5ddbed11fc..a8c4ae9c3f11f 100644
--- a/src/msg/async/AsyncConnection.h
+++ b/src/msg/async/AsyncConnection.h
@@ -23,7 +23,6 @@
 #include <list>
 #include <mutex>
 #include <map>
-using namespace std;
 
 #include "auth/AuthSessionHandler.h"
 #include "common/ceph_time.h"
diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h
index 533b54f51a3eb..a07ed4c69c3b2 100644
--- a/src/msg/async/AsyncMessenger.h
+++ b/src/msg/async/AsyncMessenger.h
@@ -19,7 +19,6 @@
 
 #include <map>
 #include <mutex>
-using namespace std;
 
 #include "include/types.h"
 #include "include/xlist.h"
diff --git a/src/msg/simple/SimpleMessenger.h b/src/msg/simple/SimpleMessenger.h
index 5e27182dd0fd8..93597a70a5b88 100644
--- a/src/msg/simple/SimpleMessenger.h
+++ b/src/msg/simple/SimpleMessenger.h
@@ -17,7 +17,6 @@
 
 #include <list>
 #include <map>
-using namespace std;
 
 #include "include/types.h"
 #include "include/xlist.h"
diff --git a/src/os/filestore/FileStore.h b/src/os/filestore/FileStore.h
index 131f98f13f39b..d7a4196645a44 100644
--- a/src/os/filestore/FileStore.h
+++ b/src/os/filestore/FileStore.h
@@ -23,7 +23,6 @@
 #include <atomic>
 #include <fstream>
 
-using namespace std;
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index bc20926a590d1..15eb7a8748bce 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -47,7 +47,6 @@
 #include <map>
 #include <memory>
 #include "include/memory.h"
-using namespace std;
 
 #include "include/unordered_map.h"
 
diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 557c8bdcb693b..948d0132af162 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -35,7 +35,6 @@
 #include <map>
 #include "include/memory.h"
 #include "include/btree_map.h"
-using namespace std;
 
 // forward declaration
 class CephContext;
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 37cc3e9b98386..55035a9ba302c 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -50,7 +50,6 @@
 #include <stack>
 #include <string>
 #include <tuple>
-using namespace std;
 
 //#define DEBUG_RECOVERY_OIDS   // track set of recovering oids explicitly, to find counting bugs
 //#define PG_DEBUG_REFS    // track provenance of pg refs, helpful for finding leaks
diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 4e8e084a2ad31..f3e48455b9d29 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -21,7 +21,6 @@
 #include "osd_types.h"
 #include "os/ObjectStore.h"
 #include <list>
-using namespace std;
 
 #define PGLOG_INDEXED_OBJECTS          (1 << 0)
 #define PGLOG_INDEXED_CALLER_OPS       (1 << 1)
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 9ec9e60637221..1d0cce885976f 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -42,7 +42,6 @@
 #include "messages/MOSDOp.h"
 #include "osd/OSDMap.h"
 
-using namespace std;
 
 class Context;
 class Messenger;
diff --git a/src/rbd_replay/PendingIO.cc b/src/rbd_replay/PendingIO.cc
index bdf93c974f338..089a60aa53f02 100644
--- a/src/rbd_replay/PendingIO.cc
+++ b/src/rbd_replay/PendingIO.cc
@@ -17,7 +17,6 @@
 
 #define dout_context g_ceph_context
 
-using namespace std;
 using namespace rbd_replay;
 
 extern "C"
diff --git a/src/rbd_replay/Replayer.cc b/src/rbd_replay/Replayer.cc
index ca1eaba84416f..e2014c3a85875 100644
--- a/src/rbd_replay/Replayer.cc
+++ b/src/rbd_replay/Replayer.cc
@@ -25,7 +25,6 @@
 
 #define dout_context g_ceph_context
 
-using namespace std;
 using namespace rbd_replay;
 
 namespace {
diff --git a/src/rbd_replay/actions.cc b/src/rbd_replay/actions.cc
index ffb996dc0a773..3c6baf7ab5d0f 100644
--- a/src/rbd_replay/actions.cc
+++ b/src/rbd_replay/actions.cc
@@ -21,7 +21,6 @@
 #define dout_context g_ceph_context
 
 using namespace rbd_replay;
-using namespace std;
 
 namespace {
 
diff --git a/src/rbd_replay/rbd-replay.cc b/src/rbd_replay/rbd-replay.cc
index 274431c19f941..ed174a43050f6 100644
--- a/src/rbd_replay/rbd-replay.cc
+++ b/src/rbd_replay/rbd-replay.cc
@@ -21,7 +21,6 @@
 #include "ImageNameMap.hpp"
 
 
-using namespace std;
 using namespace rbd_replay;
 
 
diff --git a/src/rgw/rgw_acl.cc b/src/rgw/rgw_acl.cc
index 0f246706abbad..cb89fa0d41275 100644
--- a/src/rgw/rgw_acl.cc
+++ b/src/rgw/rgw_acl.cc
@@ -15,7 +15,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 void RGWAccessControlList::_add_grant(ACLGrant *grant)
 {
diff --git a/src/rgw/rgw_acl_s3.cc b/src/rgw/rgw_acl_s3.cc
index eec7db6898a6a..43a961d18606b 100644
--- a/src/rgw/rgw_acl_s3.cc
+++ b/src/rgw/rgw_acl_s3.cc
@@ -13,7 +13,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 
 #define RGW_URI_ALL_USERS	"http://acs.amazonaws.com/groups/global/AllUsers"
diff --git a/src/rgw/rgw_acl_swift.cc b/src/rgw/rgw_acl_swift.cc
index 71f32a69528fb..d5b81bfd1e988 100644
--- a/src/rgw/rgw_acl_swift.cc
+++ b/src/rgw/rgw_acl_swift.cc
@@ -14,7 +14,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 #define SWIFT_PERM_READ  RGW_PERM_READ_OBJS
 #define SWIFT_PERM_WRITE RGW_PERM_WRITE_OBJS
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 0bf0e0da9044c..1110ea9cb4add 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -45,7 +45,6 @@
 #include "rgw_role.h"
 #include "rgw_reshard.h"
 
-using namespace std;
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw
diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index 1c4ceda7033f3..b2ee30078c33c 100644
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -34,7 +34,6 @@
 
 #define BUCKET_TAG_TIMEOUT 30
 
-using namespace std;
 
 static RGWMetadataHandler *bucket_meta_handler = NULL;
 static RGWMetadataHandler *bucket_instance_meta_handler = NULL;
diff --git a/src/rgw/rgw_cache.cc b/src/rgw/rgw_cache.cc
index 31aff871165a6..be941e139576c 100644
--- a/src/rgw/rgw_cache.cc
+++ b/src/rgw/rgw_cache.cc
@@ -7,7 +7,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 int ObjectCache::get(string& name, ObjectCacheInfo& info, uint32_t mask, rgw_cache_entry_info *cache_info)
 {
diff --git a/src/rgw/rgw_cors.cc b/src/rgw/rgw_cors.cc
index 3081dc00d64bb..f99abaad8f086 100644
--- a/src/rgw/rgw_cors.cc
+++ b/src/rgw/rgw_cors.cc
@@ -27,7 +27,6 @@
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw
-using namespace std;
 
 void RGWCORSRule::dump_origins() {
   unsigned num_origins = allowed_origins.size();
diff --git a/src/rgw/rgw_cors_s3.cc b/src/rgw/rgw_cors_s3.cc
index e2ecdbc7191f9..95d57e882e3bf 100644
--- a/src/rgw/rgw_cors_s3.cc
+++ b/src/rgw/rgw_cors_s3.cc
@@ -25,7 +25,6 @@
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 void RGWCORSRule_S3::to_xml(XMLFormatter& f) {
 
diff --git a/src/rgw/rgw_es_main.cc b/src/rgw/rgw_es_main.cc
index 43145835b5831..91a57571f2272 100644
--- a/src/rgw/rgw_es_main.cc
+++ b/src/rgw/rgw_es_main.cc
@@ -9,7 +9,6 @@
 #include "common/ceph_json.h"
 #include "rgw_es_query.h"
 
-using namespace std;
 
 int main(int argc, char *argv[])
 {
diff --git a/src/rgw/rgw_es_query.cc b/src/rgw/rgw_es_query.cc
index 5fb943f407d15..b30435c09df5c 100644
--- a/src/rgw/rgw_es_query.cc
+++ b/src/rgw/rgw_es_query.cc
@@ -8,7 +8,6 @@
 #include "rgw_common.h"
 #include "rgw_es_query.h"
 
-using namespace std;
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw
diff --git a/src/rgw/rgw_gc.cc b/src/rgw/rgw_gc.cc
index 216477e3462db..088196178e662 100644
--- a/src/rgw/rgw_gc.cc
+++ b/src/rgw/rgw_gc.cc
@@ -13,7 +13,6 @@
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 using namespace librados;
 
 static string gc_oid_prefix = "gc";
diff --git a/src/rgw/rgw_jsonparser.cc b/src/rgw/rgw_jsonparser.cc
index b4b709ce8c71f..df5201406f9ea 100644
--- a/src/rgw/rgw_jsonparser.cc
+++ b/src/rgw/rgw_jsonparser.cc
@@ -16,7 +16,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 void dump_array(JSONObj *obj)
 {
diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index a742ca309b4e2..de0791a79ff6c 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -24,7 +24,6 @@ const char* LC_STATUS[] = {
       "COMPLETE"
 };
 
-using namespace std;
 using namespace librados;
 
 bool LCRule::valid()
diff --git a/src/rgw/rgw_lc_s3.cc b/src/rgw/rgw_lc_s3.cc
index b05b8a1ac0d1a..d2f02370c0121 100644
--- a/src/rgw/rgw_lc_s3.cc
+++ b/src/rgw/rgw_lc_s3.cc
@@ -11,7 +11,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 bool LCExpiration_S3::xml_end(const char * el) {
   LCDays_S3 *lc_days = static_cast<LCDays_S3 *>(find_first("Days"));
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index b24dec27f8ef8..60168778f9172 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -72,7 +72,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 static sig_t sighandler_alrm;
 
diff --git a/src/rgw/rgw_multi.cc b/src/rgw/rgw_multi.cc
index d455f9b8f8fb1..27d35115dccee 100644
--- a/src/rgw/rgw_multi.cc
+++ b/src/rgw/rgw_multi.cc
@@ -14,7 +14,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 
 bool RGWMultiPart::xml_end(const char *el)
diff --git a/src/rgw/rgw_multi_del.cc b/src/rgw/rgw_multi_del.cc
index b9be951dd3489..2faa806971322 100644
--- a/src/rgw/rgw_multi_del.cc
+++ b/src/rgw/rgw_multi_del.cc
@@ -12,7 +12,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 
 bool RGWMultiDelObject::xml_end(const char *el)
diff --git a/src/rgw/rgw_multiparser.cc b/src/rgw/rgw_multiparser.cc
index 48a64b4544f32..63d70d729f67b 100644
--- a/src/rgw/rgw_multiparser.cc
+++ b/src/rgw/rgw_multiparser.cc
@@ -12,7 +12,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
                                   
 int main(int argc, char **argv) {
   RGWMultiXMLParser parser;
diff --git a/src/rgw/rgw_object_expirer.cc b/src/rgw/rgw_object_expirer.cc
index 21b8f9f299948..760f8fffef28b 100644
--- a/src/rgw/rgw_object_expirer.cc
+++ b/src/rgw/rgw_object_expirer.cc
@@ -6,7 +6,6 @@
 #include <sstream>
 #include <string>
 
-using namespace std;
 
 #include "auth/Crypto.h"
 
diff --git a/src/rgw/rgw_object_expirer_core.cc b/src/rgw/rgw_object_expirer_core.cc
index fb0444186c979..fde860fd72c3f 100644
--- a/src/rgw/rgw_object_expirer_core.cc
+++ b/src/rgw/rgw_object_expirer_core.cc
@@ -6,7 +6,6 @@
 #include <sstream>
 #include <string>
 
-using namespace std;
 
 #include "auth/Crypto.h"
 
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 73aa0ed543716..e535bb4a4ee0b 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -55,7 +55,6 @@
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 using namespace librados;
 using ceph::crypto::MD5;
 using boost::optional;
diff --git a/src/rgw/rgw_orphan.cc b/src/rgw/rgw_orphan.cc
index 05552782f149d..d071777473164 100644
--- a/src/rgw/rgw_orphan.cc
+++ b/src/rgw/rgw_orphan.cc
@@ -3,7 +3,6 @@
 
 #include <string>
 
-using namespace std;
 
 #include "common/config.h"
 #include "common/Formatter.h"
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index e21d4bbca4660..1d020bb2d03fd 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -79,7 +79,6 @@ using namespace librados;
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 static string notify_oid_prefix = "notify";
 static string *notify_oids = NULL;
diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index bc10b9c25c220..71726634a5a22 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -18,7 +18,6 @@ const string reshard_oid_prefix = "reshard.";
 const string reshard_lock_name = "reshard_process";
 const string bucket_instance_lock_name = "bucket_instance_lock";
 
-using namespace std;
 
 #define RESHARD_SHARD_WINDOW 64
 #define RESHARD_MAX_AIO 128
diff --git a/src/rgw/rgw_role.cc b/src/rgw/rgw_role.cc
index 732b49c7431ed..2b89e4f231d0a 100644
--- a/src/rgw/rgw_role.cc
+++ b/src/rgw/rgw_role.cc
@@ -18,7 +18,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 const string RGWRole::role_name_oid_prefix = "role_names.";
 const string RGWRole::role_oid_prefix = "roles.";
diff --git a/src/rgw/rgw_sync_trace.cc b/src/rgw/rgw_sync_trace.cc
index d6ad90605237f..d4298f691eebe 100644
--- a/src/rgw/rgw_sync_trace.cc
+++ b/src/rgw/rgw_sync_trace.cc
@@ -9,7 +9,6 @@
 #include "rgw_sync_trace.h"
 #include "rgw_rados.h"
 
-using namespace std;
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw_sync
diff --git a/src/rgw/rgw_torrent.cc b/src/rgw/rgw_torrent.cc
index ad85148b3308e..cff77b3d981cd 100644
--- a/src/rgw/rgw_torrent.cc
+++ b/src/rgw/rgw_torrent.cc
@@ -9,7 +9,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 using ceph::crypto::MD5;
 using namespace librados;
 using namespace boost;
diff --git a/src/rgw/rgw_usage.cc b/src/rgw/rgw_usage.cc
index 03a4ab4de0881..68e8956a8bd5d 100644
--- a/src/rgw/rgw_usage.cc
+++ b/src/rgw/rgw_usage.cc
@@ -8,7 +8,6 @@
 #include "rgw_usage.h"
 #include "rgw_formats.h"
 
-using namespace std;
 
 
 static void dump_usage_categories_info(Formatter *formatter, const rgw_usage_log_entry& entry, map<string, bool> *categories)
diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index e9d995415a98d..19cfe8fa250e9 100644
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -26,7 +26,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 
 static RGWMetadataHandler *user_meta_handler = NULL;
diff --git a/src/rgw/rgw_website.cc b/src/rgw/rgw_website.cc
index a80b7fff7dbc2..69599e60bdf76 100644
--- a/src/rgw/rgw_website.cc
+++ b/src/rgw/rgw_website.cc
@@ -23,7 +23,6 @@
 #include "include/types.h"
 #include "rgw_website.h"
 
-using namespace std;
 
 
 bool RGWBWRoutingRuleCondition::check_key_condition(const string& key) {
diff --git a/src/rgw/rgw_xml.cc b/src/rgw/rgw_xml.cc
index ff067a4f1da15..81000dcdb635b 100644
--- a/src/rgw/rgw_xml.cc
+++ b/src/rgw/rgw_xml.cc
@@ -15,7 +15,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
 
 XMLObjIter::
 XMLObjIter()
diff --git a/src/tools/ceph_kvstore_tool.cc b/src/tools/ceph_kvstore_tool.cc
index 14d1d19a09747..728b93f1e2efd 100644
--- a/src/tools/ceph_kvstore_tool.cc
+++ b/src/tools/ceph_kvstore_tool.cc
@@ -32,7 +32,6 @@
 #include "os/bluestore/BlueStore.h"
 #endif
 
-using namespace std;
 
 class StoreTool
 {
diff --git a/src/tools/ceph_monstore_tool.cc b/src/tools/ceph_monstore_tool.cc
index 58a8cf386a054..2a85b4e67cb2f 100644
--- a/src/tools/ceph_monstore_tool.cc
+++ b/src/tools/ceph_monstore_tool.cc
@@ -34,7 +34,6 @@
 #include "crush/CrushCompiler.h"
 
 namespace po = boost::program_options;
-using namespace std;
 
 class TraceIter {
   int fd;
diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index afd75e3d06aa9..45346b49a2194 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -45,7 +45,6 @@
 #include "include/util.h"
 
 namespace po = boost::program_options;
-using namespace std;
 
 #ifdef INTERNAL_TEST
 CompatSet get_test_compat_set() {
diff --git a/src/tools/ceph_osdomap_tool.cc b/src/tools/ceph_osdomap_tool.cc
index 936d1dc8fa450..8fbff233351ae 100644
--- a/src/tools/ceph_osdomap_tool.cc
+++ b/src/tools/ceph_osdomap_tool.cc
@@ -23,7 +23,6 @@
 #include "kv/KeyValueDB.h"
 
 namespace po = boost::program_options;
-using namespace std;
 
 int main(int argc, char **argv) {
   po::options_description desc("Allowed options");
diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index 7ecae9529ce9a..61ad4505eb618 100644
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -40,7 +40,6 @@
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_crush
 
-using namespace std;
 
 const char *infn = "stdin";
 
diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc
index 0972faf185a9e..067e2fa5926ef 100644
--- a/src/tools/monmaptool.cc
+++ b/src/tools/monmaptool.cc
@@ -20,7 +20,6 @@
 #include "include/str_list.h"
 #include "mon/MonMap.h"
 
-using namespace std;
 
 void usage()
 {
diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc
index 7178bd5ec70f4..e89f23eacb8ae 100644
--- a/src/tools/osdmaptool.cc
+++ b/src/tools/osdmaptool.cc
@@ -23,7 +23,6 @@
 #include "global/global_init.h"
 #include "osd/OSDMap.h"
 
-using namespace std;
 
 void usage()
 {