From 5164c843513212ab1ac1f721c4de04b6a865eb0c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 19 Jan 2017 16:50:40 +0200
Subject: Get rid of extension_pool

---
 build2/cli/rule.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'build2/cli/rule.cxx')

diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx
index b97bea2..d457e6d 100644
--- a/build2/cli/rule.cxx
+++ b/build2/cli/rule.cxx
@@ -88,15 +88,15 @@ namespace build2
         //
         if (t.h == nullptr)
         {
-          t.h = &search<cxx::hxx> (t.dir, t.out, t.name, nullptr, nullptr);
+          t.h = &search<cxx::hxx> (t.dir, t.out, t.name, nullopt, nullptr);
           t.h->group = &t;
 
-          t.c = &search<cxx::cxx> (t.dir, t.out, t.name, nullptr, nullptr);
+          t.c = &search<cxx::cxx> (t.dir, t.out, t.name, nullopt, nullptr);
           t.c->group = &t;
 
           if (!find_option ("--suppress-inline", t, "cli.options"))
           {
-            t.i = &search<cxx::ixx> (t.dir, t.out, t.name, nullptr, nullptr);
+            t.i = &search<cxx::ixx> (t.dir, t.out, t.name, nullopt, nullptr);
             t.i->group = &t;
           }
         }
@@ -211,7 +211,7 @@ namespace build2
                       const char* option,
                       const char* default_extension)
     {
-      assert (t.ext != nullptr); // Should have been figured out in apply().
+      assert (t.ext); // Should have been figured out in apply().
 
       if (*t.ext != default_extension)
       {
-- 
cgit v1.1