From 57abb0703ec640fdcd0b0ac165f742bbc34df533 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 14 Jun 2017 13:06:38 +0200 Subject: Next installment in C++ modules saga: module search, re-export support --- build2/algorithm.ixx | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'build2/algorithm.ixx') diff --git a/build2/algorithm.ixx b/build2/algorithm.ixx index 0e721f5..27759c9 100644 --- a/build2/algorithm.ixx +++ b/build2/algorithm.ixx @@ -364,21 +364,24 @@ namespace build2 pair, const target*> execute_prerequisites (const target_type*, action, const target&, - const timestamp&, const prerequisite_filter&); + const timestamp&, const prerequisite_filter&, + size_t); inline optional execute_prerequisites (action a, const target& t, - const timestamp& mt, const prerequisite_filter& pf) + const timestamp& mt, const prerequisite_filter& pf, + size_t n) { - return execute_prerequisites (nullptr, a, t, mt, pf).first; + return execute_prerequisites (nullptr, a, t, mt, pf, n).first; } template inline pair, const T&> execute_prerequisites (action a, const target& t, - const timestamp& mt, const prerequisite_filter& pf) + const timestamp& mt, const prerequisite_filter& pf, + size_t n) { - auto p (execute_prerequisites (T::static_type, a, t, mt, pf)); + auto p (execute_prerequisites (T::static_type, a, t, mt, pf, n)); return pair, const T&> ( p.first, static_cast (p.second)); } @@ -386,9 +389,10 @@ namespace build2 inline pair, const target&> execute_prerequisites (const target_type& tt, action a, const target& t, - const timestamp& mt, const prerequisite_filter& pf) + const timestamp& mt, const prerequisite_filter& pf, + size_t n) { - auto p (execute_prerequisites (&tt, a, t, mt, pf)); + auto p (execute_prerequisites (&tt, a, t, mt, pf, n)); return pair, const target&> (p.first, *p.second); } @@ -396,9 +400,10 @@ namespace build2 inline pair, const T&> execute_prerequisites (const target_type& tt, action a, const target& t, - const timestamp& mt, const prerequisite_filter& pf) + const timestamp& mt, const prerequisite_filter& pf, + size_t n) { - auto p (execute_prerequisites (tt, a, t, mt, pf)); + auto p (execute_prerequisites (tt, a, t, mt, pf, n)); return pair, const T&> ( p.first, static_cast (p.second)); } -- cgit v1.1