Merge pull request #8955

192d87c remove more 'using namespace' statements from headers (jeffro256)

1 files changed, 10 insertions, 11 deletions

diff --git a/contrib/epee/include/storages/portable_storage_from_json.h b/contrib/epee/include/storages/portable_storage_from_json.h
index 69192ca6b..95507328d 100644
--- a/contrib/epee/include/storages/portable_storage_from_json.h
+++ b/contrib/epee/include/storages/portable_storage_from_json.h
@@ -35,7 +35,6 @@
 
 namespace epee
 {
-  using namespace misc_utils::parse;
   namespace serialization
   {
     namespace json
@@ -91,7 +90,7 @@ namespace epee
             switch(*it)
             {
             case '"':
-              match_string2(it, buf_end, name);
+              misc_utils::parse::match_string2(it, buf_end, name);
               state = match_state_waiting_separator;
               break;
             case '}':
@@ -112,7 +111,7 @@ namespace epee
             if(*it == '"')
             {//just a named string value started
               std::string val;
-              match_string2(it, buf_end, val);
+              misc_utils::parse::match_string2(it, buf_end, val);
               //insert text value 
               stg.set_value(name, std::move(val), current_section);
               state = match_state_wonder_after_value;
@@ -120,7 +119,7 @@ namespace epee
             {//just a named number value started
               boost::string_ref val;
               bool is_v_float = false;bool is_signed = false;
-              match_number2(it, buf_end, val, is_v_float, is_signed);
+              misc_utils::parse::match_number2(it, buf_end, val, is_v_float, is_signed);
               if(!is_v_float)
               {
                 if(is_signed)
@@ -147,7 +146,7 @@ namespace epee
             }else if(isalpha(*it) )
             {// could be null, true or false
               boost::string_ref word;
-              match_word2(it, buf_end, word);
+              misc_utils::parse::match_word2(it, buf_end, word);
               if(boost::iequals(word, "null"))
               {
                 state = match_state_wonder_after_value;
@@ -202,7 +201,7 @@ namespace epee
             {
               //mean array of strings
               std::string val;
-              match_string2(it, buf_end, val);
+              misc_utils::parse::match_string2(it, buf_end, val);
               h_array = stg.insert_first_value(name, std::move(val), current_section);
               CHECK_AND_ASSERT_THROW_MES(h_array, " failed to insert values entry");
               state = match_state_array_after_value;
@@ -211,7 +210,7 @@ namespace epee
             {//array of numbers value started
               boost::string_ref val;
               bool is_v_float = false;bool is_signed_val = false;
-              match_number2(it, buf_end, val, is_v_float, is_signed_val);
+              misc_utils::parse::match_number2(it, buf_end, val, is_v_float, is_signed_val);
               if(!is_v_float)
               {
                 if (is_signed_val)
@@ -246,7 +245,7 @@ namespace epee
             }else if(isalpha(*it) )
             {// array of booleans
               boost::string_ref word;
-              match_word2(it, buf_end, word);
+              misc_utils::parse::match_word2(it, buf_end, word);
               if(boost::iequals(word, "true"))
               {
                 h_array = stg.insert_first_value(name, true, current_section);              
@@ -290,7 +289,7 @@ namespace epee
               if(*it == '"')
               {
                 std::string val;
-                match_string2(it, buf_end, val);
+                misc_utils::parse::match_string2(it, buf_end, val);
                 bool res = stg.insert_next_value(h_array, std::move(val));
                 CHECK_AND_ASSERT_THROW_MES(res, "failed to insert values");
                 state = match_state_array_after_value;
@@ -301,7 +300,7 @@ namespace epee
               {//array of numbers value started
                 boost::string_ref val;
                 bool is_v_float = false;bool is_signed_val = false;
-                match_number2(it, buf_end, val, is_v_float, is_signed_val);
+                misc_utils::parse::match_number2(it, buf_end, val, is_v_float, is_signed_val);
                 bool insert_res = false;
                 if(!is_v_float)
                 {
@@ -334,7 +333,7 @@ namespace epee
               if(isalpha(*it) )
               {// array of booleans
                 boost::string_ref word;
-                match_word2(it, buf_end, word);
+                misc_utils::parse::match_word2(it, buf_end, word);
                 if(boost::iequals(word, "true"))
                 {
                   bool r = stg.insert_next_value(h_array, true);