From fe63922030a9c5b56366ffd72d7c494c6a39fd97 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 7 May 2019 14:08:25 -0400 Subject: [PATCH] rgw: use explicit to_string() overload for boost::string_ref Fixes: http://tracker.ceph.com/issues/39611 Signed-off-by: Casey Bodley (cherry picked from commit 04c326795d2afe63c679f2542565763fee6acc09) Conflicts: src/rgw/rgw_json_enc.cc Signed-off-by: Ulrich Weigand --- src/rgw/rgw_json_enc.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc index 7302ef184adf4..b9a2ed26bfc74 100644 --- a/src/rgw/rgw_json_enc.cc +++ b/src/rgw/rgw_json_enc.cc @@ -1532,10 +1532,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", 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(); } @@ -1551,9 +1551,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", conf.get_admin_password(), f); f->close_section(); f->close_section(); @@ -1561,12 +1561,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(); -- 2.39.5