maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clangd] Avoid enum class+enumValN to avoid GCC bug(?), and use consistent style. 

llvm-svn: 341459
This commit is contained in:
Sam McCall 2018-09-05 10:39:58 +00:00
parent d445f17614
commit 47feb57bb6
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang-tools-extra/clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp
View File

@ -60,7 +60,7 @@ static llvm::cl::opt<bool> MergeOnTheFly(
"MapReduce."), "MapReduce."),
llvm::cl::init(true), llvm::cl::Hidden); llvm::cl::init(true), llvm::cl::Hidden);
enum class Format { YAML, Binary }; enum Format { YAML, Binary };
static llvm::cl::opt<Format> static llvm::cl::opt<Format>
Format("format", llvm::cl::desc("Format of the index to be written"), Format("format", llvm::cl::desc("Format of the index to be written"),
llvm::cl::values( llvm::cl::values(

13
clang-tools-extra/clangd/tool/ClangdMain.cpp
View File

@ -36,12 +36,6 @@ static llvm::cl::opt<bool>
llvm::cl::desc("Use experimental Dex static index."), llvm::cl::desc("Use experimental Dex static index."),
llvm::cl::init(true), llvm::cl::Hidden); llvm::cl::init(true), llvm::cl::Hidden);
namespace {
enum class PCHStorageFlag { Disk, Memory };
} // namespace
static llvm::cl::opt<Path> CompileCommandsDir( static llvm::cl::opt<Path> CompileCommandsDir(
"compile-commands-dir", "compile-commands-dir",
llvm::cl::desc("Specify a path to look for compile_commands.json. If path " llvm::cl::desc("Specify a path to look for compile_commands.json. If path "
@ -54,10 +48,7 @@ static llvm::cl::opt<unsigned>
llvm::cl::init(getDefaultAsyncThreadsCount())); llvm::cl::init(getDefaultAsyncThreadsCount()));
// FIXME: also support "plain" style where signatures are always omitted. // FIXME: also support "plain" style where signatures are always omitted.
enum CompletionStyleFlag { enum CompletionStyleFlag { Detailed, Bundled };
Detailed,
Bundled,
};
static llvm::cl::opt<CompletionStyleFlag> CompletionStyle( static llvm::cl::opt<CompletionStyleFlag> CompletionStyle(
"completion-style", "completion-style",
llvm::cl::desc("Granularity of code completion suggestions"), llvm::cl::desc("Granularity of code completion suggestions"),
@ -106,6 +97,7 @@ static llvm::cl::opt<bool> Test(
"Intended to simplify lit tests."), "Intended to simplify lit tests."),
llvm::cl::init(false), llvm::cl::Hidden); llvm::cl::init(false), llvm::cl::Hidden);
enum PCHStorageFlag { Disk, Memory };
static llvm::cl::opt<PCHStorageFlag> PCHStorage( static llvm::cl::opt<PCHStorageFlag> PCHStorage(
"pch-storage", "pch-storage",
llvm::cl::desc("Storing PCHs in memory increases memory usages, but may " llvm::cl::desc("Storing PCHs in memory increases memory usages, but may "
@ -167,7 +159,6 @@ static llvm::cl::opt<Path> YamlSymbolFile(
llvm::cl::init(""), llvm::cl::Hidden); llvm::cl::init(""), llvm::cl::Hidden);
enum CompileArgsFrom { LSPCompileArgs, FilesystemCompileArgs }; enum CompileArgsFrom { LSPCompileArgs, FilesystemCompileArgs };
static llvm::cl::opt<CompileArgsFrom> CompileArgsFrom( static llvm::cl::opt<CompileArgsFrom> CompileArgsFrom(
"compile_args_from", llvm::cl::desc("The source of compile commands"), "compile_args_from", llvm::cl::desc("The source of compile commands"),
llvm::cl::values(clEnumValN(LSPCompileArgs, "lsp", llvm::cl::values(clEnumValN(LSPCompileArgs, "lsp",