summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Isemann <teemperor@gmail.com>2019-07-16 09:27:02 +0000
committerRaphael Isemann <teemperor@gmail.com>2019-07-16 09:27:02 +0000
commitb5b72e08ac6907c9e20e7bc000c7ab009a409b41 (patch)
treeb1ef56f92858f24a064bb28064852da113692edc
parentea3642c9cefb0c33d05f580609c5600dd80a5531 (diff)
[lldb] Rename Options.inc to CommandOptions.inc [NFC]
It seems having two Options.inc files in the same project is giving our custom Xcode project a hard time. This patch renames the new Options.inc to CommandOptions.inc to prevent this conflict. git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@366196 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--source/Commands/CMakeLists.txt2
-rw-r--r--source/Commands/CommandObjectBreakpoint.cpp2
-rw-r--r--source/Commands/CommandObjectHelp.cpp2
-rw-r--r--source/Commands/CommandObjectSettings.cpp6
-rw-r--r--source/Commands/CommandObjectTarget.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/source/Commands/CMakeLists.txt b/source/Commands/CMakeLists.txt
index f3f96af7d..657da8caa 100644
--- a/source/Commands/CMakeLists.txt
+++ b/source/Commands/CMakeLists.txt
@@ -1,4 +1,4 @@
-lldb_tablegen(Options.inc -gen-lldb-option-defs
+lldb_tablegen(CommandOptions.inc -gen-lldb-option-defs
SOURCE Options.td
TARGET LLDBOptionsGen)
diff --git a/source/Commands/CommandObjectBreakpoint.cpp b/source/Commands/CommandObjectBreakpoint.cpp
index a661ffc62..c33f3834c 100644
--- a/source/Commands/CommandObjectBreakpoint.cpp
+++ b/source/Commands/CommandObjectBreakpoint.cpp
@@ -1249,7 +1249,7 @@ static constexpr OptionDefinition g_breakpoint_list_options[] = {
// FIXME: We need to add an "internal" command, and then add this sort of
// thing to it. But I need to see it for now, and don't want to wait.
#define LLDB_OPTIONS_breakpoint_list
-#include "Options.inc"
+#include "CommandOptions.inc"
};
#pragma mark List
diff --git a/source/Commands/CommandObjectHelp.cpp b/source/Commands/CommandObjectHelp.cpp
index ad53e0312..ab557919d 100644
--- a/source/Commands/CommandObjectHelp.cpp
+++ b/source/Commands/CommandObjectHelp.cpp
@@ -67,7 +67,7 @@ CommandObjectHelp::~CommandObjectHelp() = default;
static constexpr OptionDefinition g_help_options[] = {
#define LLDB_OPTIONS_help
-#include "Options.inc"
+#include "CommandOptions.inc"
};
llvm::ArrayRef<OptionDefinition>
diff --git a/source/Commands/CommandObjectSettings.cpp b/source/Commands/CommandObjectSettings.cpp
index 057c5de61..55a0002c5 100644
--- a/source/Commands/CommandObjectSettings.cpp
+++ b/source/Commands/CommandObjectSettings.cpp
@@ -23,7 +23,7 @@ using namespace lldb_private;
static constexpr OptionDefinition g_settings_set_options[] = {
#define LLDB_OPTIONS_settings_set
-#include "Options.inc"
+#include "CommandOptions.inc"
};
class CommandObjectSettingsSet : public CommandObjectRaw {
@@ -312,7 +312,7 @@ protected:
static constexpr OptionDefinition g_settings_write_options[] = {
#define LLDB_OPTIONS_settings_write
-#include "Options.inc"
+#include "CommandOptions.inc"
};
class CommandObjectSettingsWrite : public CommandObjectParsed {
@@ -435,7 +435,7 @@ private:
static constexpr OptionDefinition g_settings_read_options[] = {
#define LLDB_OPTIONS_settings_read
-#include "Options.inc"
+#include "CommandOptions.inc"
};
class CommandObjectSettingsRead : public CommandObjectParsed {
diff --git a/source/Commands/CommandObjectTarget.cpp b/source/Commands/CommandObjectTarget.cpp
index e8720157a..e913a2850 100644
--- a/source/Commands/CommandObjectTarget.cpp
+++ b/source/Commands/CommandObjectTarget.cpp
@@ -1968,7 +1968,7 @@ static constexpr OptionEnumValueElement g_sort_option_enumeration[] = {
static constexpr OptionDefinition g_target_modules_dump_symtab_options[] = {
#define LLDB_OPTIONS_target_modules_dump_symtab
-#include "Options.inc"
+#include "CommandOptions.inc"
};
class CommandObjectTargetModulesDumpSymtab