aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/cpp/startup_options.cc
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-06-26 09:30:16 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-06-26 18:36:46 +0200
commit2dba0de8ae805bc85575bf3de4775d81bb95cf5c (patch)
tree7cd73d41c2b341ad0e951b97d138ed556e392dad /src/main/cpp/startup_options.cc
parent236635a281e6dfb4f75d1713590a8ee520bf45ff (diff)
Internal change
RELNOTES: None. PiperOrigin-RevId: 160111047
Diffstat (limited to 'src/main/cpp/startup_options.cc')
-rw-r--r--src/main/cpp/startup_options.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/cpp/startup_options.cc b/src/main/cpp/startup_options.cc
index 7b03f69f40..46f0df475d 100644
--- a/src/main/cpp/startup_options.cc
+++ b/src/main/cpp/startup_options.cc
@@ -179,25 +179,25 @@ blaze_exit_code::ExitCode StartupOptions::ProcessArg(
host_jvm_args.push_back(value);
option_sources["host_jvm_args"] = rcfile; // NB: This is incorrect
} else if ((value = GetUnaryOption(arg, next_arg, "--bazelrc")) != NULL) {
- if (rcfile != "") {
+ if (!rcfile.empty()) {
*error = "Can't specify --bazelrc in the .bazelrc file.";
return blaze_exit_code::BAD_ARGV;
}
} else if ((value = GetUnaryOption(arg, next_arg, "--blazerc")) != NULL) {
- if (rcfile != "") {
+ if (!rcfile.empty()) {
*error = "Can't specify --blazerc in the .blazerc file.";
return blaze_exit_code::BAD_ARGV;
}
} else if (GetNullaryOption(arg, "--nomaster_blazerc") ||
GetNullaryOption(arg, "--master_blazerc")) {
- if (rcfile != "") {
+ if (!rcfile.empty()) {
*error = "Can't specify --[no]master_blazerc in .blazerc file.";
return blaze_exit_code::BAD_ARGV;
}
option_sources["blazerc"] = rcfile;
} else if (GetNullaryOption(arg, "--nomaster_bazelrc") ||
GetNullaryOption(arg, "--master_bazelrc")) {
- if (rcfile != "") {
+ if (!rcfile.empty()) {
*error = "Can't specify --[no]master_bazelrc in .bazelrc file.";
return blaze_exit_code::BAD_ARGV;
}