From 7253ffee27f6cae34e63a72b2d3d10db10571ecc Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 31 Mar 2016 10:59:45 +0200
Subject: Clean up variable lookup interfaces

---
 build2/cxx/compile.cxx | 2 +-
 build2/cxx/link.cxx    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'build2/cxx')

diff --git a/build2/cxx/compile.cxx b/build2/cxx/compile.cxx
index c4e9cee..914cd10 100644
--- a/build2/cxx/compile.cxx
+++ b/build2/cxx/compile.cxx
@@ -236,7 +236,7 @@ namespace build2
       auto test = [&s, &n, &e, &var] (const target_type& tt)
         -> const target_type*
       {
-        if (auto l = s.lookup (tt, n, var))
+        if (auto l = s.find (var, tt, n))
           if (cast<string> (l) == e)
             return &tt;
 
diff --git a/build2/cxx/link.cxx b/build2/cxx/link.cxx
index aa60c7e..e4154ab 100644
--- a/build2/cxx/link.cxx
+++ b/build2/cxx/link.cxx
@@ -780,7 +780,7 @@ namespace build2
       if (dd.expect ("cxx.link 1") != nullptr)
         l4 ([&]{trace << "rule mismatch forcing update of " << t;});
 
-      lookup<const value> ranlib;
+      lookup ranlib;
 
       // Then the linker checksum (ar/ranlib or C++ compiler).
       //
@@ -789,7 +789,7 @@ namespace build2
         ranlib = rs["config.bin.ranlib"];
 
         if (ranlib->empty ()) // @@ TMP until proper NULL support.
-          ranlib = lookup<const value> ();
+          ranlib = lookup ();
 
         const char* rl (
           ranlib
-- 
cgit v1.1