From 5164c843513212ab1ac1f721c4de04b6a865eb0c Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 19 Jan 2017 16:50:40 +0200 Subject: Get rid of extension_pool --- build2/file.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'build2/file.cxx') diff --git a/build2/file.cxx b/build2/file.cxx index 9e957a9..2889cf7 100644 --- a/build2/file.cxx +++ b/build2/file.cxx @@ -1112,8 +1112,11 @@ namespace build2 { path n (*tk.dir); n /= *tk.name; - if (tk.ext != nullptr) + if (tk.ext) + { + n += '.'; n += *tk.ext; + } process_path pp (process::try_path_search (n, true)); @@ -1126,9 +1129,9 @@ namespace build2 targets.insert ( tt, p.directory (), - dir_path (), // No out (out of project). + dir_path (), // No out (out of project). p.leaf ().base ().string (), - &extension_pool.find (p.extension ()), // Specified. + p.extension (), // Always specified. trace)); if (t.path ().empty ()) -- cgit v1.1