From 1c30f9e9c4fca846f05e881638920a9beb082fd1 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 8 Jun 2023 13:31:08 +0200
Subject: Add support for buildfile importation

---
 libbuild2/file.ixx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'libbuild2/file.ixx')

diff --git a/libbuild2/file.ixx b/libbuild2/file.ixx
index 43c46c9..dc39bcb 100644
--- a/libbuild2/file.ixx
+++ b/libbuild2/file.ixx
@@ -22,16 +22,16 @@ namespace build2
   }
 
   LIBBUILD2_SYMEXPORT const target*
-  import (context&,
-          const prerequisite_key&,
-          const string& hint,
-          bool optional_,
-          const optional<string>& metadata, // False or metadata key.
-          bool existing,
-          const location&);
+  import2 (context&,
+           const prerequisite_key&,
+           const string& hint,
+           bool optional_,
+           const optional<string>& metadata, // False or metadata key.
+           bool existing,
+           const location&);
 
   inline const target&
-  import (context& ctx, const prerequisite_key& pk)
+  import2 (context& ctx, const prerequisite_key& pk)
   {
     assert (ctx.phase == run_phase::match);
 
@@ -40,7 +40,7 @@ namespace build2
     //    Looks like the only way to do this is to keep location in name and
     //    then in prerequisite. Perhaps one day...
     //
-    return *import (ctx, pk, string (), false, nullopt, false, location ());
+    return *import2 (ctx, pk, string (), false, nullopt, false, location ());
   }
 
   inline import_result<target>
@@ -98,6 +98,6 @@ namespace build2
   inline const target*
   import_existing (context& ctx, const prerequisite_key& pk)
   {
-    return import (ctx, pk, string (), false, nullopt, true, location ());
+    return import2 (ctx, pk, string (), false, nullopt, true, location ());
   }
 }
-- 
cgit v1.1