From 7c84974ea21fa29c713b937b66e69527495e628d Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Mon, 13 Feb 2023 11:15:59 -0500
Subject: [PATCH] rgw: rgw_token.cc error: reference to 'formatter' is
 ambiguous

compiling main branch on Fedora 38 and 39/rawhide with gcc-c++-13.0.1
fails with the error:

/builddir/build/BUILD/ceph-18.0.0-2148-g9754cafc/src/rgw/rgw_token.cc:
In function 'int main(int, char**)':
/builddir/build/BUILD/ceph-18.0.0-2148-g9754cafc/src/rgw/rgw_token.cc:125:3:
error: reference to 'formatter' is ambiguous
  125 | formatter = new JSONFormatter(true /* pretty */);
      |   ^~~~~~~~~

Similar error for src/test/test_rgw_token.cc

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 src/rgw/rgw_token.cc       |  8 ++++----
 src/test/test_rgw_token.cc | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/rgw/rgw_token.cc b/src/rgw/rgw_token.cc
index 0d58671dbf2dd..999d46e0e229f 100644
--- a/src/rgw/rgw_token.cc
+++ b/src/rgw/rgw_token.cc
@@ -40,7 +40,7 @@ namespace {
   string access_key{""};
   string secret_key{""};
 
-  Formatter* formatter{nullptr};
+  Formatter* token_formatter{nullptr};
 
   bool verbose {false};
   bool do_encode {false};
@@ -122,13 +122,13 @@ int main(int argc, char **argv)
     return -EINVAL;
   }
 
-  formatter = new JSONFormatter(true /* pretty */);
+  token_formatter = new JSONFormatter(true /* pretty */);
 
   RGWToken token(type, access_key, secret_key);
   if (do_encode) {
-    token.encode_json(formatter);
+    token.encode_json(token_formatter);
     std::ostringstream os;
-    formatter->flush(os);
+    token_formatter->flush(os);
     string token_str = os.str();
     if (verbose) {
       std::cout << "expanded token: " << token_str << std::endl;
diff --git a/src/test/test_rgw_token.cc b/src/test/test_rgw_token.cc
index 0a1fc06a3b027..6136b6043c55f 100644
--- a/src/test/test_rgw_token.cc
+++ b/src/test/test_rgw_token.cc
@@ -45,25 +45,25 @@ namespace {
   std::string non_base64{"stuff here"};
   std::string non_base64_sploded{"90KLscc0Dz4U49HX-7Tx"};
 
-  Formatter* formatter{nullptr};
+  Formatter* token_formatter{nullptr};
   bool verbose {false};
 }
 
 using namespace std;
 
 TEST(TOKEN, INIT) {
-  formatter = new JSONFormatter(true /* pretty */);
-  ASSERT_NE(formatter, nullptr);
+  token_formatter = new JSONFormatter(true /* pretty */);
+  ASSERT_NE(token_formatter, nullptr);
 }
 
 TEST(TOKEN, ENCODE) {
   // encode the two supported types
   RGWToken token_ad(RGWToken::TOKEN_AD, access_key, secret_key);
-  ASSERT_EQ(token_ad.encode_json_base64(formatter), enc_ad);
+  ASSERT_EQ(token_ad.encode_json_base64(token_formatter), enc_ad);
   tokens.push_back(token_ad); // provies copiable
 
   RGWToken token_ldap(RGWToken::TOKEN_LDAP, access_key, secret_key);
-  ASSERT_EQ(token_ldap.encode_json_base64(formatter), enc_ldap);
+  ASSERT_EQ(token_ldap.encode_json_base64(token_formatter), enc_ldap);
   tokens.push_back(token_ldap);
 }
 
@@ -101,7 +101,7 @@ TEST(TOKEN, BADINPUT3) {
 }
 
 TEST(TOKEN, SHUTDOWN) {
-  delete formatter;
+  delete token_formatter;
 }
 
 int main(int argc, char *argv[])
-- 
2.39.5