From f6c87243574b06f77b14d82fbe7c0ea125df037f Mon Sep 17 00:00:00 2001 From: Shinobu Kinjo Date: Mon, 27 Nov 2017 13:46:58 +0900 Subject: [PATCH] [cleanup] Remove namespace using directives for std Signed-off-by: Shinobu Kinjo --- src/auth/KeyRing.cc | 2 -- src/ceph_fuse.cc | 1 - src/ceph_mds.cc | 1 - src/ceph_mon.cc | 1 - src/ceph_syn.cc | 1 - src/client/SyntheticClient.cc | 1 - src/client/barrier.h | 1 - src/common/Readahead.cc | 1 - src/common/address_helper.cc | 1 - src/common/blkdev.cc | 1 - src/common/ceph_json.cc | 1 - src/common/cmdparse.cc | 1 - src/common/dns_resolve.cc | 1 - src/crush/CrushWrapper.h | 1 - src/erasure-code/ErasureCode.cc | 1 - src/erasure-code/jerasure/ErasureCodeJerasure.cc | 1 - src/include/Distribution.h | 1 - src/include/filepath.h | 1 - src/include/rangeset.h | 1 - src/include/types.h | 1 - src/key_value_store/kv_flat_btree_async.cc | 1 - src/key_value_store/kv_flat_btree_async.h | 1 - src/key_value_store/kvs_arg_types.h | 1 - src/krbd.cc | 1 - src/mds/MDCache.cc | 1 - src/mds/Server.cc | 1 - src/mgr/OSDHealthMetricCollector.cc | 1 - src/mon/AuthMonitor.h | 1 - src/mon/Elector.h | 1 - src/mon/LogMonitor.h | 1 - src/mon/MDSMonitor.h | 1 - src/mon/MonmapMonitor.h | 1 - src/mon/OSDMonitor.h | 1 - src/msg/Message.cc | 1 - src/msg/Messenger.h | 1 - src/msg/async/AsyncConnection.h | 1 - src/msg/async/AsyncMessenger.h | 1 - src/msg/simple/SimpleMessenger.h | 1 - src/os/filestore/FileStore.h | 1 - src/osd/OSD.h | 1 - src/osd/OSDMap.h | 1 - src/osd/PG.h | 1 - src/osd/PGLog.h | 1 - src/osdc/Objecter.h | 1 - src/rbd_replay/PendingIO.cc | 1 - src/rbd_replay/Replayer.cc | 1 - src/rbd_replay/actions.cc | 1 - src/rbd_replay/rbd-replay.cc | 1 - src/rgw/rgw_acl.cc | 1 - src/rgw/rgw_acl_s3.cc | 1 - src/rgw/rgw_acl_swift.cc | 1 - src/rgw/rgw_admin.cc | 1 - src/rgw/rgw_bucket.cc | 1 - src/rgw/rgw_cache.cc | 1 - src/rgw/rgw_cors.cc | 1 - src/rgw/rgw_cors_s3.cc | 1 - src/rgw/rgw_es_main.cc | 1 - src/rgw/rgw_es_query.cc | 1 - src/rgw/rgw_gc.cc | 1 - src/rgw/rgw_jsonparser.cc | 1 - src/rgw/rgw_lc.cc | 1 - src/rgw/rgw_lc_s3.cc | 1 - src/rgw/rgw_main.cc | 1 - src/rgw/rgw_multi.cc | 1 - src/rgw/rgw_multi_del.cc | 1 - src/rgw/rgw_multiparser.cc | 1 - src/rgw/rgw_object_expirer.cc | 1 - src/rgw/rgw_object_expirer_core.cc | 1 - src/rgw/rgw_op.cc | 1 - src/rgw/rgw_orphan.cc | 1 - src/rgw/rgw_rados.cc | 1 - src/rgw/rgw_reshard.cc | 1 - src/rgw/rgw_role.cc | 1 - src/rgw/rgw_sync_trace.cc | 1 - src/rgw/rgw_torrent.cc | 1 - src/rgw/rgw_usage.cc | 1 - src/rgw/rgw_user.cc | 1 - src/rgw/rgw_website.cc | 1 - src/rgw/rgw_xml.cc | 1 - src/tools/ceph_kvstore_tool.cc | 1 - src/tools/ceph_monstore_tool.cc | 1 - src/tools/ceph_objectstore_tool.cc | 1 - src/tools/ceph_osdomap_tool.cc | 1 - src/tools/crushtool.cc | 1 - src/tools/monmaptool.cc | 1 - src/tools/osdmaptool.cc | 1 - 86 files changed, 87 deletions(-) diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc index aac835ed3af..06d5a291a14 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 4416e9d3c58..cb2715299af 100644 --- a/src/ceph_fuse.cc +++ b/src/ceph_fuse.cc @@ -16,7 +16,6 @@ #include #include #include -using namespace std; #include "common/config.h" #include "common/errno.h" diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index acce67289af..536edca41fc 100644 --- a/src/ceph_mds.cc +++ b/src/ceph_mds.cc @@ -19,7 +19,6 @@ #include #include -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 1792facf650..9139e8b83ef 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -18,7 +18,6 @@ #include #include -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 2a6419b10fd..490a30d6e5b 100644 --- a/src/ceph_syn.cc +++ b/src/ceph_syn.cc @@ -15,7 +15,6 @@ #include #include #include -using namespace std; #include "common/config.h" diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc index 88574e07a20..89f8498d888 100644 --- a/src/client/SyntheticClient.cc +++ b/src/client/SyntheticClient.cc @@ -16,7 +16,6 @@ #include #include -using namespace std; #include "common/config.h" diff --git a/src/client/barrier.h b/src/client/barrier.h index 8ed3040fab5..f94a48acd05 100644 --- a/src/client/barrier.h +++ b/src/client/barrier.h @@ -25,7 +25,6 @@ class Client; typedef boost::icl::interval::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 9318bbf545e..647b7ed2430 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 8f625f8db4d..09ec805bce2 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://:" 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 fa518e2f18a..8d524818e89 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 diff --git a/src/common/ceph_json.cc b/src/common/ceph_json.cc index e326fdebcf3..29b551e8fb0 100644 --- a/src/common/ceph_json.cc +++ b/src/common/ceph_json.cc @@ -5,7 +5,6 @@ #include #include -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 9a873f51442..9ce9ff6a540 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 13f06548e84..f3594b0041f 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 d2fc4858601..8e4e9336783 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 855147d954e..fa5d8e29a4e 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 599073eb3f7..0369dd87ee5 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 a1be0019cc0..e4f0b30b129 100644 --- a/src/include/Distribution.h +++ b/src/include/Distribution.h @@ -17,7 +17,6 @@ #define CEPH_DISTRIBUTION_H #include -using namespace std; class Distribution { vector p; diff --git a/src/include/filepath.h b/src/include/filepath.h index b4c33070c9f..1e28cffd0a1 100644 --- a/src/include/filepath.h +++ b/src/include/filepath.h @@ -26,7 +26,6 @@ #include #include #include -using namespace std; #include "buffer.h" #include "encoding.h" diff --git a/src/include/rangeset.h b/src/include/rangeset.h index 547af26e2b6..51c1c840551 100644 --- a/src/include/rangeset.h +++ b/src/include/rangeset.h @@ -23,7 +23,6 @@ */ #include -using namespace std; //typedef int T; diff --git a/src/include/types.h b/src/include/types.h index c68f9e10ebd..99fad9ced8e 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -59,7 +59,6 @@ extern "C" { #include #include -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 5d3c3829531..25dc5c1f6b7 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 #include -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 f16ba6d9a99..2b3761850e9 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 #include -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 4bd32f02aeb..98063621e38 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 523c3db1f5f..9841135155f 100644 --- a/src/krbd.cc +++ b/src/krbd.cc @@ -40,7 +40,6 @@ #include #include -using namespace std; const static int POLL_TIMEOUT=120000; diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index f180fa8c472..9fe1fa15e00 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 e72d8a7504e..56f0b86c16d 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -61,7 +61,6 @@ #include #include -using namespace std; #include "common/config.h" diff --git a/src/mgr/OSDHealthMetricCollector.cc b/src/mgr/OSDHealthMetricCollector.cc index 0b3d4180d7f..d86ad07be06 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 8f3ca30245b..777f2e80361 100644 --- a/src/mon/AuthMonitor.h +++ b/src/mon/AuthMonitor.h @@ -17,7 +17,6 @@ #include #include -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 b9e6310b5b8..4c005c965fe 100644 --- a/src/mon/Elector.h +++ b/src/mon/Elector.h @@ -17,7 +17,6 @@ #define CEPH_MON_ELECTOR_H #include -using namespace std; #include "include/types.h" #include "include/Context.h" diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h index d2f082596c5..7c8043689ec 100644 --- a/src/mon/LogMonitor.h +++ b/src/mon/LogMonitor.h @@ -17,7 +17,6 @@ #include #include -using namespace std; #include "include/types.h" #include "PaxosService.h" diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h index 840f4e469a5..c59858a092b 100644 --- a/src/mon/MDSMonitor.h +++ b/src/mon/MDSMonitor.h @@ -20,7 +20,6 @@ #include #include -using namespace std; #include "include/types.h" #include "mds/FSMap.h" diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h index e3e01173b6e..57e1fd6dbf2 100644 --- a/src/mon/MonmapMonitor.h +++ b/src/mon/MonmapMonitor.h @@ -22,7 +22,6 @@ #include #include -using namespace std; #include "include/types.h" #include "msg/Messenger.h" diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index e2bc85fba62..96870c0ab77 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -23,7 +23,6 @@ #include #include -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 fb30526e48a..8cc5b8e1fc3 100644 --- a/src/msg/Message.cc +++ b/src/msg/Message.cc @@ -7,7 +7,6 @@ #endif #include -using namespace std; #include "include/types.h" diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h index c6dbcc17694..eb354178036 100644 --- a/src/msg/Messenger.h +++ b/src/msg/Messenger.h @@ -18,7 +18,6 @@ #define CEPH_MESSENGER_H #include -using namespace std; #include "Message.h" #include "Dispatcher.h" diff --git a/src/msg/async/AsyncConnection.h b/src/msg/async/AsyncConnection.h index 4ad5ddbed11..a8c4ae9c3f1 100644 --- a/src/msg/async/AsyncConnection.h +++ b/src/msg/async/AsyncConnection.h @@ -23,7 +23,6 @@ #include #include #include -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 533b54f51a3..a07ed4c69c3 100644 --- a/src/msg/async/AsyncMessenger.h +++ b/src/msg/async/AsyncMessenger.h @@ -19,7 +19,6 @@ #include #include -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 5e27182dd0f..93597a70a5b 100644 --- a/src/msg/simple/SimpleMessenger.h +++ b/src/msg/simple/SimpleMessenger.h @@ -17,7 +17,6 @@ #include #include -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 131f98f13f3..d7a4196645a 100644 --- a/src/os/filestore/FileStore.h +++ b/src/os/filestore/FileStore.h @@ -23,7 +23,6 @@ #include #include -using namespace std; #include diff --git a/src/osd/OSD.h b/src/osd/OSD.h index bc20926a590..15eb7a8748b 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -47,7 +47,6 @@ #include #include #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 557c8bdcb69..948d0132af1 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -35,7 +35,6 @@ #include #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 37cc3e9b983..55035a9ba30 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -50,7 +50,6 @@ #include #include #include -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 4e8e084a2ad..f3e48455b9d 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -21,7 +21,6 @@ #include "osd_types.h" #include "os/ObjectStore.h" #include -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 9ec9e606372..1d0cce88597 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 bdf93c974f3..089a60aa53f 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 ca1eaba8441..e2014c3a858 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 ffb996dc0a7..3c6baf7ab5d 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 274431c19f9..ed174a43050 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 0f246706abb..cb89fa0d412 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 eec7db6898a..43a961d1860 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 71f32a69528..d5b81bfd1e9 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 0bf0e0da904..1110ea9cb4a 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 1c4ceda7033..b2ee30078c3 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 31aff871165..be941e13957 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 3081dc00d64..f99abaad8f0 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 e2ecdbc7191..95d57e882e3 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 43145835b58..91a57571f22 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 5fb943f407d..b30435c09df 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 216477e3462..088196178e6 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 b4b709ce8c7..df5201406f9 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 a742ca309b4..de0791a79ff 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 b05b8a1ac0d..d2f02370c01 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(find_first("Days")); diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index b24dec27f8e..60168778f91 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 d455f9b8f8f..27d35115dcc 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 b9be951dd34..2faa8069713 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 48a64b4544f..63d70d729f6 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 21b8f9f2999..760f8fffef2 100644 --- a/src/rgw/rgw_object_expirer.cc +++ b/src/rgw/rgw_object_expirer.cc @@ -6,7 +6,6 @@ #include #include -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 fb0444186c9..fde860fd72c 100644 --- a/src/rgw/rgw_object_expirer_core.cc +++ b/src/rgw/rgw_object_expirer_core.cc @@ -6,7 +6,6 @@ #include #include -using namespace std; #include "auth/Crypto.h" diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 73aa0ed5437..e535bb4a4ee 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 05552782f14..d0717774731 100644 --- a/src/rgw/rgw_orphan.cc +++ b/src/rgw/rgw_orphan.cc @@ -3,7 +3,6 @@ #include -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 e21d4bbca46..1d020bb2d03 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 bc10b9c25c2..71726634a5a 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 732b49c7431..2b89e4f231d 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 d6ad9060523..d4298f691ee 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 ad85148b330..cff77b3d981 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 03a4ab4de08..68e8956a8bd 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 *categories) diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc index e9d995415a9..19cfe8fa250 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 a80b7fff7db..69599e60bdf 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 ff067a4f1da..81000dcdb63 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 14d1d19a097..728b93f1e2e 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 58a8cf386a0..2a85b4e67cb 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 afd75e3d06a..45346b49a21 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 936d1dc8fa4..8fbff233351 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 7ecae9529ce..61ad4505eb6 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 0972faf185a..067e2fa5926 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 7178bd5ec70..e89f23eacb8 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() { -- 2.39.5