RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9760 from stiopaa1/msg_messengercc_move

Browse Source 
msg/Messenger.cc: add std::move

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-01-04 18:02:47 +08:00 committed by GitHub
commit 2ffc63bc9a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/msg/Messenger.cc
View File

@ -17,7 +17,7 @@ Messenger *Messenger::create_client_messenger(CephContext *cct, string lname)
uint64_t nonce = 0;
get_random_bytes((char*)&nonce, sizeof(nonce));
return Messenger::create(cct, cct->_conf->ms_type, entity_name_t::CLIENT(),
lname, nonce, 0);
std::move(lname), nonce, 0);
}
Messenger *Messenger::create(CephContext *cct, const string &type,
@ -35,13 +35,13 @@ Messenger *Messenger::create(CephContext *cct, const string &type,
r = dis(random_engine);
}
if (r == 0 || type == "simple")
return new SimpleMessenger(cct, name, lname, nonce);
return new SimpleMessenger(cct, name, std::move(lname), nonce);
else if (r == 1 || type == "async")
return new AsyncMessenger(cct, name, lname, nonce);
return new AsyncMessenger(cct, name, std::move(lname), nonce);
#ifdef HAVE_XIO
else if ((type == "xio") &&
cct->check_experimental_feature_enabled("ms-type-xio"))
return new XioMessenger(cct, name, lname, nonce, cflags);
return new XioMessenger(cct, name, std::move(lname), nonce, cflags);
#endif
lderr(cct) << "unrecognized ms_type '" << type << "'" << dendl;
return nullptr;