From 85244605d2a9ed51f2660bf6e4017906e64e2a04 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Wed, 11 Aug 2021 12:01:08 +0800
Subject: [PATCH] msg: build without "using namespace std"

* add "std::" prefix in headers
* add "using" declarations in .cc files.

so we don't rely on "using namespace std" in one or more included
headers.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/msg/compressor_registry.cc | 6 +++---
 src/msg/compressor_registry.h  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/msg/compressor_registry.cc b/src/msg/compressor_registry.cc
index 61efa0dd099..80b155fbdf8 100644
--- a/src/msg/compressor_registry.cc
+++ b/src/msg/compressor_registry.cc
@@ -39,7 +39,7 @@ void CompressorRegistry::handle_conf_change(
   _refresh_config();
 }
 
-std::vector<uint32_t> CompressorRegistry::_parse_method_list(const string& s)
+std::vector<uint32_t> CompressorRegistry::_parse_method_list(const std::string& s)
 {
   std::vector<uint32_t> methods;
 
@@ -64,7 +64,7 @@ std::vector<uint32_t> CompressorRegistry::_parse_method_list(const string& s)
 
 void CompressorRegistry::_refresh_config()
 {
-  auto c_mode = Compressor::get_comp_mode_type(cct->_conf.get_val<string>("ms_osd_compress_mode"));
+  auto c_mode = Compressor::get_comp_mode_type(cct->_conf.get_val<std::string>("ms_osd_compress_mode"));
 
   if (c_mode) {
     ms_osd_compress_mode = *c_mode;
@@ -75,7 +75,7 @@ void CompressorRegistry::_refresh_config()
     ms_osd_compress_mode = Compressor::COMP_NONE;
   }
 
-  ms_osd_compression_methods = _parse_method_list(cct->_conf.get_val<string>("ms_osd_compression_algorithm"));
+  ms_osd_compression_methods = _parse_method_list(cct->_conf.get_val<std::string>("ms_osd_compression_algorithm"));
   ms_osd_compress_min_size = cct->_conf.get_val<std::uint64_t>("ms_osd_compress_min_size");
 
   ms_compress_secure = cct->_conf.get_val<bool>("ms_compress_secure");
diff --git a/src/msg/compressor_registry.h b/src/msg/compressor_registry.h
index 4a28cc16fa4..bda08ca437b 100644
--- a/src/msg/compressor_registry.h
+++ b/src/msg/compressor_registry.h
@@ -65,5 +65,5 @@ private:
   std::vector<uint32_t> ms_osd_compression_methods;
 
   void _refresh_config();
-  std::vector<uint32_t> _parse_method_list(const string& s);
+  std::vector<uint32_t> _parse_method_list(const std::string& s);
 };
-- 
2.39.5