diff --git a/lldb/include/lldb/DataFormatters/FormattersContainer.h b/lldb/include/lldb/DataFormatters/FormattersContainer.h --- a/lldb/include/lldb/DataFormatters/FormattersContainer.h +++ b/lldb/include/lldb/DataFormatters/FormattersContainer.h @@ -169,8 +169,7 @@ friend class TypeCategoryImpl; - FormattersContainer(std::string name, IFormatChangeListener *lst) - : m_format_map(lst), m_name(name) {} + FormattersContainer(IFormatChangeListener *lst) : m_format_map(lst) {} void Add(MapKeyType type, const MapValueType &entry) { Add_Impl(std::move(type), entry, static_cast(nullptr)); @@ -205,7 +204,6 @@ protected: BackEndType m_format_map; - std::string m_name; FormattersContainer(const FormattersContainer &) = delete; const FormattersContainer &operator=(const FormattersContainer &) = delete; diff --git a/lldb/include/lldb/DataFormatters/TypeCategory.h b/lldb/include/lldb/DataFormatters/TypeCategory.h --- a/lldb/include/lldb/DataFormatters/TypeCategory.h +++ b/lldb/include/lldb/DataFormatters/TypeCategory.h @@ -42,10 +42,9 @@ typedef typename RegexMatchContainer::ForEachCallback RegexMatchForEachCallback; - FormatterContainerPair(const char *exact_name, const char *regex_name, - IFormatChangeListener *clist) - : m_exact_sp(new ExactMatchContainer(std::string(exact_name), clist)), - m_regex_sp(new RegexMatchContainer(std::string(regex_name), clist)) {} + FormatterContainerPair(IFormatChangeListener *clist) + : m_exact_sp(new ExactMatchContainer(clist)), + m_regex_sp(new RegexMatchContainer(clist)) {} ~FormatterContainerPair() = default; diff --git a/lldb/source/DataFormatters/TypeCategory.cpp b/lldb/source/DataFormatters/TypeCategory.cpp --- a/lldb/source/DataFormatters/TypeCategory.cpp +++ b/lldb/source/DataFormatters/TypeCategory.cpp @@ -15,11 +15,9 @@ TypeCategoryImpl::TypeCategoryImpl(IFormatChangeListener *clist, ConstString name) - : m_format_cont("format", "regex-format", clist), - m_summary_cont("summary", "regex-summary", clist), - m_filter_cont("filter", "regex-filter", clist), - m_synth_cont("synth", "regex-synth", clist), m_enabled(false), - m_change_listener(clist), m_mutex(), m_name(name), m_languages() {} + : m_format_cont(clist), m_summary_cont(clist), m_filter_cont(clist), + m_synth_cont(clist), m_enabled(false), m_change_listener(clist), + m_mutex(), m_name(name), m_languages() {} static bool IsApplicable(lldb::LanguageType category_lang, lldb::LanguageType valobj_lang) {