diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-06-28 17:14:21 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-06-28 17:14:21 +0200 |
| commit | 86db4fb7388285adc24e3aa6eb3f7ec68efd15f4 (patch) | |
| tree | 115295a42619abdf8c7fde800f87cd671bed7e1e /build2/variable.txx | |
| parent | 41cad5bba8a718a0403c0578660c60e81c9f46e4 (diff) | |
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).
Diffstat (limited to 'build2/variable.txx')
| -rw-r--r-- | build2/variable.txx | 6 |
1 files changed, 3 insertions, 3 deletions
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 |