diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2016-11-26 01:33:50 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2016-11-26 20:39:07 +0300 |
| commit | b296b1fc43bbb115d9e826d02a7aca09e713b422 (patch) | |
| tree | 19ace294ad065b6a6b465a979074884dd85aff0a /build2/function | |
| parent | 73c7f8615ebfaf76063207fbd071b2ff7b6b5a3f (diff) | |
Add support for VC15
Diffstat (limited to 'build2/function')
| -rw-r--r-- | build2/function | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build2/function b/build2/function index 192c4a3..6397720 100644 --- a/build2/function +++ b/build2/function @@ -116,10 +116,10 @@ namespace build2 D d) : function_overload (an, mi, ma, move (ts), im) { - // std::is_pod appears to be broken in VC14 and also in GCC up to + // std::is_pod appears to be broken in VC15 and also in GCC up to // 5 (pointers to members). // -#if !((defined(_MSC_VER) && _MSC_VER <= 1900) || \ +#if !((defined(_MSC_VER) && _MSC_VER <= 1910) || \ (defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 5)) static_assert (std::is_pod<D>::value, "type is not POD"); #endif @@ -327,10 +327,10 @@ namespace build2 static const size_t max = sizeof...(A); static const size_t min = max - function_args_opt<A...>::count; - // VC14 doesn't realize that a pointer to static object (in our case it is + // VC15 doesn't realize that a pointer to static object (in our case it is // &value_trair<T>::value_type) is constexpr. // -#if !defined(_MSC_VER) || _MSC_VER > 1900 +#if !defined(_MSC_VER) || _MSC_VER > 1910 static constexpr const optional<const value_type*> types[max] = { function_arg<A>::type ()...}; #else @@ -339,7 +339,7 @@ namespace build2 }; template <typename... A> -#if !defined(_MSC_VER) || _MSC_VER > 1900 +#if !defined(_MSC_VER) || _MSC_VER > 1910 constexpr const optional<const value_type*> function_args<A...>::types[function_args<A...>::max]; #else @@ -356,7 +356,7 @@ namespace build2 static const size_t max = 0; static const size_t min = 0; -#if !defined(_MSC_VER) || _MSC_VER > 1900 +#if !defined(_MSC_VER) || _MSC_VER > 1910 static constexpr const optional<const value_type*>* types = nullptr; #else static const optional<const value_type*>* const types; |