diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-04 13:55:50 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-05-05 13:07:37 -0700 |
| commit | e6dfcfda999b322b1e524520613cf987a3c2583f (patch) | |
| tree | 81cf38dc2a5e1da8f611b106f0e8ede86c53e369 /src/messages | |
| parent | 921d4b3d8b79485a6786f8ca75b2a96ea377da84 (diff) | |
| download | ceph-e6dfcfda999b322b1e524520613cf987a3c2583f.tar.gz | |
fix some shadowing arguments
Small subset of what -Wshadow turns up.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'src/messages')
| -rw-r--r-- | src/messages/MMonCommand.h | 4 | ||||
| -rw-r--r-- | src/messages/MOSDOp.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h index 5a97d9c8330..dcf2ceb489f 100644 --- a/src/messages/MMonCommand.h +++ b/src/messages/MMonCommand.h @@ -26,8 +26,8 @@ class MMonCommand : public PaxosServiceMessage { vector<string> cmd; MMonCommand() : PaxosServiceMessage(MSG_MON_COMMAND, 0) {} - MMonCommand(ceph_fsid_t &f, version_t version) : - PaxosServiceMessage(MSG_MON_COMMAND, version), + MMonCommand(ceph_fsid_t &f, version_t v) : + PaxosServiceMessage(MSG_MON_COMMAND, v), fsid(f) { } private: diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h index ca1d9db56dd..3daf005f9b4 100644 --- a/src/messages/MOSDOp.h +++ b/src/messages/MOSDOp.h @@ -88,8 +88,8 @@ public: bool may_exec() { assert(rmw_flags); return rmw_flags & (CEPH_OSD_FLAG_EXEC | CEPH_OSD_FLAG_EXEC_PUBLIC); } bool require_exec_caps() { assert(rmw_flags); return rmw_flags & CEPH_OSD_FLAG_EXEC; } - void set_peer_stat(const osd_peer_stat_t& stat) { - peer_stat = stat; + void set_peer_stat(const osd_peer_stat_t& st) { + peer_stat = st; flags |= CEPH_OSD_FLAG_PEERSTAT; } const osd_peer_stat_t& get_peer_stat() { |