diff options
Diffstat (limited to 'src/lib/base/scan_name.cpp')
-rw-r--r-- | src/lib/base/scan_name.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/base/scan_name.cpp b/src/lib/base/scan_name.cpp index 2b32dc7d3..4688d0871 100644 --- a/src/lib/base/scan_name.cpp +++ b/src/lib/base/scan_name.cpp @@ -63,7 +63,7 @@ deref_aliases(const std::pair<size_t, std::string>& in) SCAN_Name::SCAN_Name(std::string algo_spec, const std::string& extra) : SCAN_Name(algo_spec) { - alg_name += extra; + m_alg_name += extra; } SCAN_Name::SCAN_Name(const char* algo_spec) : SCAN_Name(std::string(algo_spec)) @@ -72,7 +72,7 @@ SCAN_Name::SCAN_Name(const char* algo_spec) : SCAN_Name(std::string(algo_spec)) SCAN_Name::SCAN_Name(std::string algo_spec) { - orig_algo_spec = algo_spec; + m_orig_algo_spec = algo_spec; std::vector<std::pair<size_t, std::string> > name; size_t level = 0; @@ -119,7 +119,7 @@ SCAN_Name::SCAN_Name(std::string algo_spec) if(name.size() == 0) throw Decoding_Error(decoding_error + "Empty name"); - alg_name = name[0].second; + m_alg_name = name[0].second; bool in_modes = false; @@ -127,11 +127,11 @@ SCAN_Name::SCAN_Name(std::string algo_spec) { if(name[i].first == 0) { - mode_info.push_back(make_arg(name, i)); + m_mode_info.push_back(make_arg(name, i)); in_modes = true; } else if(name[i].first == 1 && !in_modes) - args.push_back(make_arg(name, i)); + m_args.push_back(make_arg(name, i)); } } @@ -157,21 +157,21 @@ std::string SCAN_Name::arg(size_t i) const if(i >= arg_count()) throw Invalid_Argument("SCAN_Name::arg " + std::to_string(i) + " out of range for '" + as_string() + "'"); - return args[i]; + return m_args[i]; } std::string SCAN_Name::arg(size_t i, const std::string& def_value) const { if(i >= arg_count()) return def_value; - return args[i]; + return m_args[i]; } size_t SCAN_Name::arg_as_integer(size_t i, size_t def_value) const { if(i >= arg_count()) return def_value; - return to_u32bit(args[i]); + return to_u32bit(m_args[i]); } std::mutex SCAN_Name::g_alias_map_mutex; |