diff options
author | 2016-09-13 00:32:09 +0000 | |
---|---|---|
committer | 2016-09-13 12:26:12 +0000 | |
commit | 85ac641ddf5adde31b5d2f58b76ae5db251218a9 (patch) | |
tree | 2a4d1335b0676b629071135ab2f21b0c52c55d58 /src/main/cpp/option_processor.h | |
parent | eb44094ed24de3a139a21dd6804d99e0acb8caf6 (diff) |
Rollback of startup options changes.
--
MOS_MIGRATED_REVID=132940326
Diffstat (limited to 'src/main/cpp/option_processor.h')
-rw-r--r-- | src/main/cpp/option_processor.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/cpp/option_processor.h b/src/main/cpp/option_processor.h index bb777e917b..e9dd44c0f7 100644 --- a/src/main/cpp/option_processor.h +++ b/src/main/cpp/option_processor.h @@ -21,7 +21,7 @@ #include <string> #include <vector> -#include "src/main/cpp/startup_options.h" +#include "src/main/cpp/blaze_startup_options.h" #include "src/main/cpp/util/exit_code.h" namespace blaze { @@ -33,7 +33,7 @@ using std::string; // to the server. class OptionProcessor { public: - OptionProcessor(std::unique_ptr<StartupOptions> default_startup_options); + OptionProcessor(); virtual ~OptionProcessor(); @@ -59,7 +59,7 @@ class OptionProcessor { // executed in. void GetCommandArguments(std::vector<string>* result) const; - StartupOptions* GetParsedStartupOptions() const; + const BlazeStartupOptions& GetParsedStartupOptions() const; virtual blaze_exit_code::ExitCode FindUserBlazerc(const char* cmdLineRcFile, const string& rc_basename, @@ -115,7 +115,7 @@ class OptionProcessor { string command_; std::vector<string> command_arguments_; bool initialized_; - std::unique_ptr<StartupOptions> parsed_startup_options_; + std::unique_ptr<BlazeStartupOptions> parsed_startup_options_; }; } // namespace blaze |