Re-commit r343500 "Fix build with GCC < 5.0 (PR39131)"

Occasionally didn't commit actual fix the first time.

llvm-svn: 343769
This commit is contained in:
Tatyana Krasnukha 2018-10-04 11:39:55 +00:00
parent 764ad2f732
commit 320bf4157b
1 changed files with 9 additions and 7 deletions

View File

@ -1013,6 +1013,14 @@ public:
"type format clear", "Delete all existing format styles.") {}
};
static constexpr OptionDefinition g_type_formatter_list_options[] = {
// clang-format off
{LLDB_OPT_SET_1, false, "category-regex", 'w', OptionParser::eRequiredArgument, nullptr, {}, 0, eArgTypeName, "Only show categories matching this filter."},
{LLDB_OPT_SET_2, false, "language", 'l', OptionParser::eRequiredArgument, nullptr, {}, 0, eArgTypeLanguage, "Only show the category for a specific language."}
// clang-format on
};
template <typename FormatterType>
class CommandObjectTypeFormatterList : public CommandObjectParsed {
typedef typename FormatterType::SharedPointer FormatterSharedPointer;
@ -1055,13 +1063,7 @@ class CommandObjectTypeFormatterList : public CommandObjectParsed {
}
llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
static constexpr OptionDefinition g_option_table[] {
// clang-format off
{LLDB_OPT_SET_1, false, "category-regex", 'w', OptionParser::eRequiredArgument, nullptr, {}, 0, eArgTypeName, "Only show categories matching this filter."},
{LLDB_OPT_SET_2, false, "language", 'l', OptionParser::eRequiredArgument, nullptr, {}, 0, eArgTypeLanguage, "Only show the category for a specific language."}
// clang-format on
};
return llvm::ArrayRef<OptionDefinition>(g_option_table);
return llvm::makeArrayRef(g_type_formatter_list_options);
}
// Instance variables to hold the values for command options.