organicmaps/gflags
13
Fork 0
mirror of https://github.com/gflags/gflags.git synced 2025-04-05 05:25:04 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fix build on some clang variants

Browse source 
Some platforms' yval.h defines restrict as a macro when using clang, which causes this file to not compile.
This commit is contained in:
Matt Hargett 2018-09-24 18:24:50 -07:00 • committed by Andreas Schuh
parent 660603a3df
commit 2c49763b73
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gflags_reporting.cc
View file

@ -296,10 +296,10 @@ static void ShowUsageWithFlagsMatching(const char *argv0,
}
}
void ShowUsageWithFlagsRestrict(const char *argv0, const char *restrict) {
void ShowUsageWithFlagsRestrict(const char *argv0, const char *restrict_) {
vector<string> substrings;
if (restrict != NULL && *restrict != '\0') {
substrings.push_back(restrict);
if (restrict_ != NULL && *restrict_ != '\0') {
substrings.push_back(restrict_);
}
ShowUsageWithFlagsMatching(argv0, substrings);
}
@ -389,8 +389,8 @@ void HandleCommandLineHelpFlags() {
gflags_exitfunc(1);
} else if (!FLAGS_helpon.empty()) {
string restrict = PATH_SEPARATOR + FLAGS_helpon + ".";
ShowUsageWithFlagsRestrict(progname, restrict.c_str());
string restrict_ = PATH_SEPARATOR + FLAGS_helpon + ".";
ShowUsageWithFlagsRestrict(progname, restrict_.c_str());
gflags_exitfunc(1);
} else if (!FLAGS_helpmatch.empty()) {