aboutsummaryrefslogtreecommitdiff
path: root/build2/algorithm.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-28 08:33:42 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-28 08:33:42 +0200
commit593fd960891027b97567b2622ed4b6c16070ab36 (patch)
treef4cb383f8606fde6adff7ac9f90a20cc9ad59840 /build2/algorithm.cxx
parentac402e1fef2c13b5860ca5223d764bbfdfb867e3 (diff)
Implement support for pre-processing version headers (or other files)
Also implement the build system version check.
Diffstat (limited to 'build2/algorithm.cxx')
-rw-r--r--build2/algorithm.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx
index 049df0c..a6208d4 100644
--- a/build2/algorithm.cxx
+++ b/build2/algorithm.cxx
@@ -1059,7 +1059,7 @@ namespace build2
return r;
}
- pair<const target*, target_state>
+ pair<optional<target_state>, const target*>
execute_prerequisites (const target_type* tt,
action a, const target& t,
const timestamp& mt, const prerequisite_filter& pf)
@@ -1141,7 +1141,10 @@ namespace build2
}
assert (rt != nullptr);
- return make_pair (e ? rt : nullptr, rs);
+
+ return pair<optional<target_state>, const target*> (
+ e ? optional<target_state> () : rs,
+ tt != nullptr ? rt : nullptr);
}
target_state