From 1f0f5b5b9eeaea93126583b40070091baf3bc92d Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Thu, 22 Sep 2016 20:22:55 +0000 Subject: Convert option tables to ArrayRefs. This change is very mechanical. All it does is change the signature of `Options::GetDefinitions()` and `OptionGroup:: GetDefinitions()` to return an `ArrayRef` instead of a `const OptionDefinition *`. In the case of the former, it deletes the sentinel entry from every table, and in the case of the latter, it removes the `GetNumDefinitions()` method from the interface. These are no longer necessary as `ArrayRef` carries its own length. In the former case, iteration was done by using a sentinel entry, so there was no knowledge of length. Because of this the individual option tables were allowed to be defined below the corresponding class (after all, only a pointer was needed). Now, however, the length must be known at compile time to construct the `ArrayRef`, and as a result it is necessary to move every option table before its corresponding class. This results in this CL looking very big, but in terms of substance there is not much here. Differential revision: https://reviews.llvm.org/D24834 llvm-svn: 282188 --- lldb/source/Commands/CommandObjectHelp.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lldb/source/Commands/CommandObjectHelp.h') diff --git a/lldb/source/Commands/CommandObjectHelp.h b/lldb/source/Commands/CommandObjectHelp.h index 827eb574de3..df1c0ab1292 100644 --- a/lldb/source/Commands/CommandObjectHelp.h +++ b/lldb/source/Commands/CommandObjectHelp.h @@ -75,11 +75,7 @@ public: m_show_hidden = false; } - const OptionDefinition *GetDefinitions() override { return g_option_table; } - - // Options table: Required for subclasses of Options. - - static OptionDefinition g_option_table[]; + llvm::ArrayRef GetDefinitions() override; // Instance variables to hold the values for command options. -- cgit v1.2.3