h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-01 04:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make contains() more general

Browse Source 
Allow contains() to find arbitrary values in arbitrary vectors, and adopt it
in place of std::find.
This commit is contained in:
ridiculousfish
2018-08-11 19:55:06 -07:00
parent b0dc715d18
commit 1473f952d4
9 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/builtin_argparse.cpp
View File

@@ -75,8 +75,7 @@ static int check_for_mutually_exclusive_flags(const argparse_cmd_opts_t &opts, i
// We saw this option at least once. Check all the sets of mutually exclusive options to see
// if this option appears in any of them.
for (const auto &xarg_set : opts.exclusive_flag_sets) {
auto found = std::find(xarg_set.begin(), xarg_set.end(), opt_spec->short_flag);
if (found != xarg_set.end()) {
if (contains(xarg_set, opt_spec->short_flag)) {
// Okay, this option is in a mutually exclusive set of options. Check if any of the
// other mutually exclusive options have been seen.
for (const auto &xflag : xarg_set) {