From b4a4416e1fa27d361745c669cfb1a3e47dc66d61 Mon Sep 17 00:00:00 2001
From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Wed, 17 May 2017 16:13:54 +0200
Subject: [PATCH] rgw: drop using namespace std in header files

We're still having the include in include/type.h, so just sweeping
things under the rug for now

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---
 src/rgw/rgw_acl.h         | 2 --
 src/rgw/rgw_acl_s3.h      | 3 ---
 src/rgw/rgw_bucket.h      | 3 ---
 src/rgw/rgw_common.h      | 2 --
 src/rgw/rgw_cors_s3.h     | 2 --
 src/rgw/rgw_cors_swift.h  | 2 --
 src/rgw/rgw_lc.h          | 1 -
 src/rgw/rgw_lc_s3.h       | 4 ----
 src/rgw/rgw_op.h          | 1 -
 src/rgw/rgw_replica_log.h | 2 --
 src/rgw/rgw_rest_role.cc  | 2 --
 src/rgw/rgw_torrent.h     | 1 -
 src/rgw/rgw_user.h        | 2 --
 src/rgw/rgw_xml.h         | 3 ---
 14 files changed, 30 deletions(-)

diff --git a/src/rgw/rgw_acl.h b/src/rgw/rgw_acl.h
index 24567677e8e..26c84d121a2 100644
--- a/src/rgw/rgw_acl.h
+++ b/src/rgw/rgw_acl.h
@@ -15,8 +15,6 @@
 
 #include "rgw_basic_types.h"
 
-using namespace std;
-
 #define RGW_PERM_NONE            0x00
 #define RGW_PERM_READ            0x01
 #define RGW_PERM_WRITE           0x02
diff --git a/src/rgw/rgw_acl_s3.h b/src/rgw/rgw_acl_s3.h
index 3a52735e091..6991a0b8363 100644
--- a/src/rgw/rgw_acl_s3.h
+++ b/src/rgw/rgw_acl_s3.h
@@ -13,9 +13,6 @@
 #include "rgw_xml.h"
 #include "rgw_acl.h"
 
-
-using namespace std;
-
 class RGWRados;
 
 class ACLPermission_S3 : public ACLPermission, public XMLObj
diff --git a/src/rgw/rgw_bucket.h b/src/rgw/rgw_bucket.h
index 09a5ae2e825..14c472faa8c 100644
--- a/src/rgw/rgw_bucket.h
+++ b/src/rgw/rgw_bucket.h
@@ -20,9 +20,6 @@
 #include "common/ceph_time.h"
 #include "rgw_formats.h"
 
-
-using namespace std;
-
 // define as static when RGWBucket implementation compete
 extern void rgw_get_buckets_obj(const rgw_user& user_id, string& buckets_obj_id);
 
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 5ad7637b44c..90e4a7410d9 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -29,8 +29,6 @@
 #include "cls/rgw/cls_rgw_types.h"
 #include "include/rados/librados.hpp"
 
-using namespace std;
-
 namespace ceph {
   class Formatter;
 }
diff --git a/src/rgw/rgw_cors_s3.h b/src/rgw/rgw_cors_s3.h
index cad423c10a2..aac42d8f147 100644
--- a/src/rgw/rgw_cors_s3.h
+++ b/src/rgw/rgw_cors_s3.h
@@ -25,8 +25,6 @@
 #include "rgw_xml.h"
 #include "rgw_cors.h"
 
-using namespace std;
-
 class RGWCORSRule_S3 : public RGWCORSRule, public XMLObj
 {
   public:
diff --git a/src/rgw/rgw_cors_swift.h b/src/rgw/rgw_cors_swift.h
index 6aef5e13561..d2516dd0357 100644
--- a/src/rgw/rgw_cors_swift.h
+++ b/src/rgw/rgw_cors_swift.h
@@ -23,8 +23,6 @@
 
 #include "rgw_cors.h"
 
-using namespace std;
-
 class RGWCORSConfiguration_SWIFT : public RGWCORSConfiguration
 {
   public:
diff --git a/src/rgw/rgw_lc.h b/src/rgw/rgw_lc.h
index 16bd56babd5..480ba3fe513 100644
--- a/src/rgw/rgw_lc.h
+++ b/src/rgw/rgw_lc.h
@@ -20,7 +20,6 @@
 
 #include <atomic>
 
-using namespace std;
 #define HASH_PRIME 7877
 #define MAX_ID_LEN 255
 static string lc_oid_prefix = "lc";
diff --git a/src/rgw/rgw_lc_s3.h b/src/rgw/rgw_lc_s3.h
index c969ac979c9..66dcb7fa990 100644
--- a/src/rgw/rgw_lc_s3.h
+++ b/src/rgw/rgw_lc_s3.h
@@ -12,10 +12,6 @@
 #include "rgw_lc.h"
 #include "rgw_xml.h"
 
-
-
-using namespace std;
-
 class LCID_S3 : public XMLObj
 {
 public:
diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 1fcf4c30120..7538b027d0a 100644
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -43,7 +43,6 @@
 
 #include "include/assert.h"
 
-using namespace std;
 using ceph::crypto::SHA1;
 
 struct req_state;
diff --git a/src/rgw/rgw_replica_log.h b/src/rgw/rgw_replica_log.h
index 45cac52d68c..699600c0fe4 100644
--- a/src/rgw/rgw_replica_log.h
+++ b/src/rgw/rgw_replica_log.h
@@ -22,8 +22,6 @@
 class RGWRados;
 class CephContext;
 
-using namespace std;
-
 #define META_REPLICA_LOG_OBJ_PREFIX "meta.replicalog."
 #define DATA_REPLICA_LOG_OBJ_PREFIX "data.replicalog."
 
diff --git a/src/rgw/rgw_rest_role.cc b/src/rgw/rgw_rest_role.cc
index 386504398fe..d19a589ae77 100644
--- a/src/rgw/rgw_rest_role.cc
+++ b/src/rgw/rgw_rest_role.cc
@@ -15,8 +15,6 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using namespace std;
-
 void RGWRestRole::send_response()
 {
   if (op_ret) {
diff --git a/src/rgw/rgw_torrent.h b/src/rgw/rgw_torrent.h
index 6d2b28cd91a..ab8e89bbd79 100644
--- a/src/rgw/rgw_torrent.h
+++ b/src/rgw/rgw_torrent.h
@@ -11,7 +11,6 @@
 #include "rgw_rados.h"
 #include "rgw_common.h"
 
-using namespace std;
 using ceph::crypto::SHA1;
 
 struct req_state;
diff --git a/src/rgw/rgw_user.h b/src/rgw/rgw_user.h
index 50cc1b62909..7a27d0e7007 100644
--- a/src/rgw/rgw_user.h
+++ b/src/rgw/rgw_user.h
@@ -19,8 +19,6 @@
 #include "common/Formatter.h"
 #include "rgw_formats.h"
 
-using namespace std;
-
 #define RGW_USER_ANON_ID "anonymous"
 
 #define SECRET_KEY_LEN 40
diff --git a/src/rgw/rgw_xml.h b/src/rgw/rgw_xml.h
index 2517c7b78e8..1f37a6a49e2 100644
--- a/src/rgw/rgw_xml.h
+++ b/src/rgw/rgw_xml.h
@@ -10,9 +10,6 @@
 #include <include/types.h>
 #include <common/Formatter.h>
 
-using namespace std;
-
-
 class XMLObj;
 
 class XMLObjIter {
-- 
2.47.3