From 53f02bf28dae507a51515ed6ac03226d68816494 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 2 Feb 2017 10:20:50 +0200
Subject: Store extension in target map key rather than in target

This is in preparation for locking its modification/access.
---
 build2/cli/target.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/build2/cli/target.cxx b/build2/cli/target.cxx
index 3f09d30..48dc95b 100644
--- a/build2/cli/target.cxx
+++ b/build2/cli/target.cxx
@@ -48,7 +48,7 @@ namespace build2
       return file_mtime (h->path ());
     }
 
-    static target*
+    static pair<target*, optional<string>>
     cli_cxx_factory (const target_type&,
                      dir_path d,
                      dir_path o,
@@ -66,7 +66,7 @@ namespace build2
       targets.insert<cxx::cxx> (d, o, n, trace);
       targets.insert<cxx::ixx> (d, o, n, trace);
 
-      return new cli_cxx (move (d), move (o), move (n), move (e));
+      return make_pair (new cli_cxx (move (d), move (o), move (n)), move (e));
     }
 
     const target_type cli_cxx::static_type
-- 
cgit v1.1