Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rgw: drop using std ns in header files and other cleanups #15137

Merged
merged 2 commits into from
May 18, 2017
Merged

rgw: drop using std ns in header files and other cleanups #15137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a4416
rgw: drop using namespace std in header files
theanalyst May 17, 2017
9db24d5
rgw: drop expat header in a couple of files
theanalyst May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/rgw/rgw_acl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/rgw/rgw_acl_s3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
#include "rgw_xml.h"
#include "rgw_acl.h"


using namespace std;

class RGWRados;

class ACLPermission_S3 : public ACLPermission, public XMLObj
Expand Down
3 changes: 0 additions & 3 deletions src/rgw/rgw_bucket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 0 additions & 2 deletions src/rgw/rgw_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
#include "cls/rgw/cls_rgw_types.h"
#include "include/rados/librados.hpp"

using namespace std;

namespace ceph {
class Formatter;
}
Expand Down
3 changes: 0 additions & 3 deletions src/rgw/rgw_cors_s3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,12 @@
#include <map>
#include <string>
#include <iosfwd>
#include <expat.h>

#include <include/types.h>
#include <common/Formatter.h>
#include "rgw_xml.h"
#include "rgw_cors.h"

using namespace std;

class RGWCORSRule_S3 : public RGWCORSRule, public XMLObj
{
public:
Expand Down
2 changes: 0 additions & 2 deletions src/rgw/rgw_cors_swift.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

#include "rgw_cors.h"

using namespace std;

class RGWCORSConfiguration_SWIFT : public RGWCORSConfiguration
{
public:
Expand Down
1 change: 0 additions & 1 deletion src/rgw/rgw_lc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

#include <atomic>

using namespace std;
#define HASH_PRIME 7877
#define MAX_ID_LEN 255
static string lc_oid_prefix = "lc";
Expand Down
6 changes: 0 additions & 6 deletions src/rgw/rgw_lc_s3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,10 @@
#include <iostream>
#include <include/types.h>

#include <expat.h>

#include "include/str_list.h"
#include "rgw_lc.h"
#include "rgw_xml.h"



using namespace std;

class LCID_S3 : public XMLObj
{
public:
Expand Down
1 change: 0 additions & 1 deletion src/rgw/rgw_op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@

#include "include/assert.h"

using namespace std;
using ceph::crypto::SHA1;

struct req_state;
Expand Down
2 changes: 0 additions & 2 deletions src/rgw/rgw_replica_log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Expand Down
2 changes: 0 additions & 2 deletions src/rgw/rgw_rest_role.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

#define dout_subsys ceph_subsys_rgw

using namespace std;

void RGWRestRole::send_response()
{
if (op_ret) {
Expand Down
1 change: 0 additions & 1 deletion src/rgw/rgw_torrent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "rgw_rados.h"
#include "rgw_common.h"

using namespace std;
using ceph::crypto::SHA1;

struct req_state;
Expand Down
2 changes: 0 additions & 2 deletions src/rgw/rgw_user.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/rgw/rgw_xml.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
#include <include/types.h>
#include <common/Formatter.h>

using namespace std;


class XMLObj;

class XMLObjIter {
Expand Down