From 593fd960891027b97567b2622ed4b6c16070ab36 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 28 Apr 2017 08:33:42 +0200
Subject: Implement support for pre-processing version headers (or other files)

Also implement the build system version check.
---
 build2/algorithm.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'build2/algorithm.cxx')

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
-- 
cgit v1.1