From 4f5b6cb7ed4e05e98cce7e692462f49e24b7a39a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 22 Aug 2019 14:38:57 +0200
Subject: Targets, scopes, vars

---
 libbuild2/prerequisite.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libbuild2/prerequisite.hxx')

diff --git a/libbuild2/prerequisite.hxx b/libbuild2/prerequisite.hxx
index f79ce04..3183a29 100644
--- a/libbuild2/prerequisite.hxx
+++ b/libbuild2/prerequisite.hxx
@@ -8,6 +8,7 @@
 #include <libbuild2/types.hxx>
 #include <libbuild2/utility.hxx>
 
+#include <libbuild2/scope.hxx>
 #include <libbuild2/action.hxx>
 #include <libbuild2/variable.hxx>
 #include <libbuild2/target-key.hxx>
@@ -17,7 +18,6 @@
 
 namespace build2
 {
-  class scope;
   class target;
 
   // Light-weight (by being shallow-pointing) prerequisite key, similar
@@ -31,7 +31,7 @@ namespace build2
   class prerequisite_key
   {
   public:
-    typedef build2::scope scope_type;
+    using scope_type = build2::scope;
 
     const optional<project_name>& proj;
     target_key tk;                // The .dir and .out members can be relative.
@@ -117,7 +117,7 @@ namespace build2
           name (move (n)),
           ext (move (e)),
           scope (s),
-          vars (false /* global */) {}
+          vars (s.ctx, false /* global */) {}
 
     // Make a prerequisite from a target.
     //
-- 
cgit v1.1