From dbc89807156566cda7ba2ee4ddf67c15ed0d33e1 Mon Sep 17 00:00:00 2001 From: Minmin Gong Date: Sun, 5 May 2019 15:21:14 -0700 Subject: [PATCH] Fix the compiling errors in VS2019 ARM64 with /std:c++17 --- include/boost/type_traits/detail/is_function_cxx_11.hpp | 4 ++-- .../type_traits/detail/is_member_function_pointer_cxx_11.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/type_traits/detail/is_function_cxx_11.hpp b/include/boost/type_traits/detail/is_function_cxx_11.hpp index 432af4e..d175e40 100644 --- a/include/boost/type_traits/detail/is_function_cxx_11.hpp +++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp @@ -376,7 +376,7 @@ namespace boost { template struct is_function : public true_type {}; -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) #ifdef __CLR_VER template struct is_function : public true_type {}; @@ -559,7 +559,7 @@ namespace boost { struct is_function : public true_type {}; #endif -#endif // _MSC_VER +#endif // defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) #endif diff --git a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp index d88a004..b0502cb 100644 --- a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp +++ b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp @@ -419,7 +419,7 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {};