diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-11 17:01:28 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-11 17:01:28 -0700 |
| commit | 4db6bb7837c58641c4416e87643833bca4945841 (patch) | |
| tree | 5f06f1dd5968c63c8e94cc077fd6016165ba0931 /include/llvm/Support/CommandLine.h | |
| parent | 6b4efcb6bb663678c5cdd63a22e1ccc5ec6819f1 (diff) | |
| parent | 2fa8af224ea026f9432e833fd6f42a216423a010 (diff) | |
Merge commit '2fa8af224ea026f9432e833fd6f42a216423a010'
Conflicts:
lib/ExecutionEngine/JIT/JITEmitter.cpp
lib/MC/MCELFStreamer.cpp
lib/Target/ARM/ARMAsmPrinter.h
lib/Target/X86/X86RegisterInfo.td
lib/Target/X86/X86TargetMachine.cpp
tools/llc/llc.cpp
Diffstat (limited to 'include/llvm/Support/CommandLine.h')
| -rw-r--r-- | include/llvm/Support/CommandLine.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h index d0c304712a..8f7d879f2e 100644 --- a/include/llvm/Support/CommandLine.h +++ b/include/llvm/Support/CommandLine.h @@ -41,16 +41,14 @@ namespace cl { // ParseCommandLineOptions - Command line option processing entry point. // void ParseCommandLineOptions(int argc, const char * const *argv, - const char *Overview = 0, - bool ReadResponseFiles = false); + const char *Overview = 0); //===----------------------------------------------------------------------===// // ParseEnvironmentOptions - Environment variable option processing alternate // entry point. // void ParseEnvironmentOptions(const char *progName, const char *envvar, - const char *Overview = 0, - bool ReadResponseFiles = false); + const char *Overview = 0); ///===---------------------------------------------------------------------===// /// SetVersionPrinter - Override the default (LLVM specific) version printer |