RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28013 from cbodley/wip-39611

Browse Source 
rgw: use explicit to_string() overload for boost::string_ref

Reviewed-by: Nathan Cutler <nculter@suse.com>
This commit is contained in:
Casey Bodley 2019-05-08 11:39:20 -04:00 committed by GitHub
commit ec3896c634
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rgw/rgw_json_enc.cc
View File

@ -1528,10 +1528,10 @@ void rgw::keystone::AdminTokenRequestVer2::dump(Formatter* const f) const
f->open_object_section("token_request");
f->open_object_section("auth");
f->open_object_section("passwordCredentials");
encode_json("username", to_string(conf.get_admin_user()), f);
encode_json("username", ::to_string(conf.get_admin_user()), f);
encode_json("password", ::to_string(conf.get_admin_password()), f);
f->close_section();
encode_json("tenantName", to_string(conf.get_admin_tenant()), f);
encode_json("tenantName", ::to_string(conf.get_admin_tenant()), f);
f->close_section();
f->close_section();
}
@ -1547,9 +1547,9 @@ void rgw::keystone::AdminTokenRequestVer3::dump(Formatter* const f) const
f->open_object_section("password");
f->open_object_section("user");
f->open_object_section("domain");
encode_json("name", to_string(conf.get_admin_domain()), f);
encode_json("name", ::to_string(conf.get_admin_domain()), f);
f->close_section();
encode_json("name", to_string(conf.get_admin_user()), f);
encode_json("name", ::to_string(conf.get_admin_user()), f);
encode_json("password", ::to_string(conf.get_admin_password()), f);
f->close_section();
f->close_section();
@ -1557,12 +1557,12 @@ void rgw::keystone::AdminTokenRequestVer3::dump(Formatter* const f) const
f->open_object_section("scope");
f->open_object_section("project");
if (! conf.get_admin_project().empty()) {
encode_json("name", to_string(conf.get_admin_project()), f);
encode_json("name", ::to_string(conf.get_admin_project()), f);
} else {
encode_json("name", to_string(conf.get_admin_tenant()), f);
encode_json("name", ::to_string(conf.get_admin_tenant()), f);
}
f->open_object_section("domain");
encode_json("name", to_string(conf.get_admin_domain()), f);
encode_json("name", ::to_string(conf.get_admin_domain()), f);
f->close_section();
f->close_section();
f->close_section();