From 86db4fb7388285adc24e3aa6eb3f7ec68efd15f4 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 28 Jun 2016 17:14:21 +0200
Subject: Work around static initialization order issue

value_traits<T>::value_type initialization is not constexpr in VC because
of pointers to function template instantiations (which apparently are not
constexpr).
---
 build2/variable.txx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build2/variable.txx')

diff --git a/build2/variable.txx b/build2/variable.txx
index 31d9284..6d3121a 100644
--- a/build2/variable.txx
+++ b/build2/variable.txx
@@ -272,7 +272,7 @@ namespace build2
 
   template <typename T>
   const string value_traits<vector<T>>::type_name = string (
-    value_traits<T>::value_type.name) + 's';
+    value_traits<T>::type_name) + 's';
 
   template <typename T>
   const value_type value_traits<vector<T>>::value_type
@@ -432,8 +432,8 @@ namespace build2
 
   template <typename K, typename V>
   const string value_traits<std::map<K, V>>::type_name = string (
-    value_traits<K>::value_type.name) + '_' +
-    value_traits<V>::value_type.name + "_map";
+    value_traits<K>::type_name) + '_' +
+    value_traits<V>::type_name + "_map";
 
   template <typename K, typename V>
   const value_type value_traits<std::map<K, V>>::value_type
-- 
cgit v1.1