From 5aa9c718cc347f00bc56c86d26015adc3781f5f9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 12 Jun 2017 14:06:28 +0200 Subject: Remove few unused lambda captures --- build2/cc/common.cxx | 4 ++-- build2/cc/install.cxx | 4 ++-- build2/cc/msvc.cxx | 4 ++-- build2/parser.cxx | 4 ++-- build2/test/script/parser.cxx | 2 +- build2/version/rule.cxx | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'build2') diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx index 1df84c9..b62358e 100644 --- a/build2/cc/common.cxx +++ b/build2/cc/common.cxx @@ -204,7 +204,7 @@ namespace build2 : var_pool[*t + ".sys_lib_dirs"]]); }; - auto find_lo = [top_lo, t, cc, &bs, &l, &lo, this] () + auto find_lo = [top_lo, t, cc, &bs, &l, &lo] () { lo = (t == nullptr || cc) ? top_lo : link_order (bs, link_type (l)); }; @@ -263,7 +263,7 @@ namespace build2 auto proc_int = [&l, &proc_impl, &proc_lib, &proc_opt, &sysd, &usrd, - &find_sysd, &find_lo, &sys, &sys_simple, + &find_sysd, &find_lo, &sys_simple, &bs, act, &lo, this] (const lookup& lu) { const vector* ns (cast_null> (lu)); diff --git a/build2/cc/install.cxx b/build2/cc/install.cxx index e09a62f..529a758 100644 --- a/build2/cc/install.cxx +++ b/build2/cc/install.cxx @@ -97,7 +97,7 @@ namespace build2 // auto& lp (t.data ()); - auto ln = [&id, this] (const path& f, const path& l) + auto ln = [&id] (const path& f, const path& l) { install_l (id, f.leaf (), l.leaf (), false); }; @@ -125,7 +125,7 @@ namespace build2 // auto& lp (t.data ()); - auto rm = [&id, this] (const path& l) + auto rm = [&id] (const path& l) { return uninstall_f (id, nullptr, l.leaf (), false); }; diff --git a/build2/cc/msvc.cxx b/build2/cc/msvc.cxx index e3765cd..b00b8a9 100644 --- a/build2/cc/msvc.cxx +++ b/build2/cc/msvc.cxx @@ -289,7 +289,7 @@ namespace build2 liba* r (nullptr); - auto search = [&r, &ld, &d, &p, exist, &trace, this] ( + auto search = [&r, &ld, &d, &p, exist, &trace] ( const char* pf, const char* sf) -> bool { r = msvc_search_library ( @@ -320,7 +320,7 @@ namespace build2 libs* s (nullptr); - auto search = [&s, &ld, &d, &pk, exist, &trace, this] ( + auto search = [&s, &ld, &d, &pk, exist, &trace] ( const char* pf, const char* sf) -> bool { if (libi* i = msvc_search_library ( diff --git a/build2/parser.cxx b/build2/parser.cxx index b6aff19..0edb612 100644 --- a/build2/parser.cxx +++ b/build2/parser.cxx @@ -2414,8 +2414,8 @@ namespace build2 append (move (m), a); }; - auto include_pattern = [&r, &append, &include_match, sp, this] - (string&& p, bool a) + auto include_pattern = + [&r, &append, &include_match, sp] (string&& p, bool a) { // If we don't already have any matches and our pattern doesn't contain // multiple recursive wildcards, then the result will be unique and we diff --git a/build2/test/script/parser.cxx b/build2/test/script/parser.cxx index ae6bdbc..6058ed2 100644 --- a/build2/test/script/parser.cxx +++ b/build2/test/script/parser.cxx @@ -1477,7 +1477,7 @@ namespace build2 r.str = move (w); }; - auto add_here_str_regex = [&l, &check_regex_mod, this] ( + auto add_here_str_regex = [&l, &check_regex_mod] ( redirect& r, int fd, string&& w) { const char* what (nullptr); diff --git a/build2/version/rule.cxx b/build2/version/rule.cxx index d9669da..c5eb56d 100644 --- a/build2/version/rule.cxx +++ b/build2/version/rule.cxx @@ -281,7 +281,7 @@ namespace build2 // Perform substitutions for the project itself (normally the version.* // variables but we allow anything set on the root scope). // - auto subst_self = [&rs, &m] (const location& l, const string& s) + auto subst_self = [&rs] (const location& l, const string& s) { if (lookup x = rs.vars[s]) { -- cgit v1.1