summaryrefslogtreecommitdiffstats
path: root/src/messages/MDiscoverReply.h
diff options
context:
space:
mode:
authorJohn Spray <john.spray@redhat.com>2014-08-28 14:40:34 +0200
committerJohn Spray <john.spray@redhat.com>2014-08-28 15:04:09 +0200
commitfc89c276386382f00f6e82697d4fdedd1b65698a (patch)
tree86e1a3f9b7bac8aca67e2959aef586be5953fa1a /src/messages/MDiscoverReply.h
parentdoc: Update docs about OSD benchmark syntax (diff)
downloadceph-fc89c276386382f00f6e82697d4fdedd1b65698a.tar.xz
ceph-fc89c276386382f00f6e82697d4fdedd1b65698a.zip
messages: remove `using namespace std` in headers
Avoid polluting global namespace: .cc files should do the `using` if they want it. Signed-off-by: John Spray <john.spray@redhat.com>
Diffstat (limited to 'src/messages/MDiscoverReply.h')
-rw-r--r--src/messages/MDiscoverReply.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h
index a28321ac4c5..4c2527802b9 100644
--- a/src/messages/MDiscoverReply.h
+++ b/src/messages/MDiscoverReply.h
@@ -19,9 +19,7 @@
#include "msg/Message.h"
#include "include/filepath.h"
-#include <vector>
#include <string>
-using namespace std;
@@ -37,7 +35,7 @@ using namespace std;
* they are false if there is no returned data, ie the first group is empty.
*
* we also return errors:
- * error_flag_dn(string) - the specified dentry dne
+ * error_flag_dn(std::string) - the specified dentry dne
* error_flag_dir - the last item wasn't a dir, so we couldn't continue.
*
* and sometimes,
@@ -79,7 +77,7 @@ class MDiscoverReply : public Message {
// and the response
bool flag_error_dn;
bool flag_error_dir;
- string error_dentry; // dentry that was not found (to trigger waiters on asker)
+ std::string error_dentry; // dentry that was not found (to trigger waiters on asker)
bool unsolicited;
__s32 dir_auth_hint;
@@ -99,7 +97,7 @@ class MDiscoverReply : public Message {
bool is_flag_error_dn() { return flag_error_dn; }
bool is_flag_error_dir() { return flag_error_dir; }
- string& get_error_dentry() { return error_dentry; }
+ std::string& get_error_dentry() { return error_dentry; }
int get_starts_with() { return starts_with; }
@@ -160,7 +158,7 @@ public:
}
// void set_flag_forward() { flag_forward = true; }
- void set_flag_error_dn(const string& dn) {
+ void set_flag_error_dn(const std::string& dn) {
flag_error_dn = true;
error_dentry = dn;
}
@@ -170,7 +168,7 @@ public:
void set_dir_auth_hint(int a) {
dir_auth_hint = a;
}
- void set_error_dentry(const string& dn) {
+ void set_error_dentry(const std::string& dn) {
error_dentry = dn;
}