]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
msg: build without "using namespace std"
authorKefu Chai <kchai@redhat.com>
Wed, 11 Aug 2021 04:01:08 +0000 (12:01 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 13 Aug 2021 04:23:38 +0000 (12:23 +0800)
* 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
src/msg/compressor_registry.h

index 61efa0dd09931967db1ea0642ec88bba80ab5489..80b155fbdf8eddc1fb56aad9decd3847e9221b99 100644 (file)
@@ -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");
index 4a28cc16fa48c4ff6f811dbdd09672a3ddafbc61..bda08ca437b4061128ec4a1a3335b8dd4c8ca52f 100644 (file)
@@ -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);
 };