diff options
| author |  Greg Estren <gregce@google.com> | 2016-09-13 00:32:09 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-09-13 12:26:12 +0000 |
| commit | 85ac641ddf5adde31b5d2f58b76ae5db251218a9 (patch) | |
| tree | 2a4d1335b0676b629071135ab2f21b0c52c55d58 /src/main/cpp/option_processor.cc | |
| parent | eb44094ed24de3a139a21dd6804d99e0acb8caf6 (diff) | |
Rollback of startup options changes.
--
MOS_MIGRATED_REVID=132940326
Diffstat (limited to 'src/main/cpp/option_processor.cc')
| -rw-r--r-- | src/main/cpp/option_processor.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc index bb56efc624..87560b8a00 100644 --- a/src/main/cpp/option_processor.cc +++ b/src/main/cpp/option_processor.cc @@ -160,10 +160,8 @@ blaze_exit_code::ExitCode OptionProcessor::RcFile::Parse( return blaze_exit_code::SUCCESS; } -OptionProcessor::OptionProcessor( - std::unique_ptr<StartupOptions> default_startup_options) : - initialized_(false), - parsed_startup_options_(std::move(default_startup_options)) { +OptionProcessor::OptionProcessor() + : initialized_(false), parsed_startup_options_(new BlazeStartupOptions()) { } // Return the path to the user's rc file. If cmdLineRcFile != NULL, @@ -241,7 +239,7 @@ blaze_exit_code::ExitCode OptionProcessor::ParseOptions( } blaze_exit_code::ExitCode validate_startup_options_exit_code = - parsed_startup_options_->ValidateStartupOptions(args, error); + BlazeStartupOptions::ValidateStartupOptions(args, error); if (validate_startup_options_exit_code != blaze_exit_code::SUCCESS) { return validate_startup_options_exit_code; } @@ -460,8 +458,8 @@ const string& OptionProcessor::GetCommand() const { return command_; } -StartupOptions* OptionProcessor::GetParsedStartupOptions() const { - return parsed_startup_options_.get(); +const BlazeStartupOptions& OptionProcessor::GetParsedStartupOptions() const { + return *parsed_startup_options_.get(); } OptionProcessor::~OptionProcessor() { |