From e755de789e146beea66bf6a4b55685034502df41 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sun, 25 Jun 2017 20:39:53 +0300
Subject: Make path value type to be base for dir_path

---
 build2/variable.cxx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'build2/variable.cxx')

diff --git a/build2/variable.cxx b/build2/variable.cxx
index bcf9d62..8e32b30 100644
--- a/build2/variable.cxx
+++ b/build2/variable.cxx
@@ -568,7 +568,12 @@ namespace build2
         {
           return path (move (n.value));
         }
-        catch (const invalid_path&) {} // Fall through.
+        catch (invalid_path& e)
+        {
+          n.value = move (e.path); // Restore the name object for diagnostics.
+
+          // Fall through.
+        }
       }
 
       // Fall through.
@@ -627,7 +632,7 @@ namespace build2
   {
     type_name,
     sizeof (dir_path),
-    nullptr,                        // No base, or should it be path?
+    &value_traits<path>::value_type, // Assume direct cast works for both.
     &default_dtor<dir_path>,
     &default_copy_ctor<dir_path>,
     &default_copy_assign<dir_path>,
-- 
cgit v1.1