diff --git a/appveyor.yml b/appveyor.yml index a7d38d7..6940c70 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,6 +41,8 @@ environment: ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-clr asynch-exceptions=on - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 ARGS: --toolset=msvc-14.1 address-model=32 cxxflags=-clr asynch-exceptions=on + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + ARGS: --toolset=msvc-14.1 architecture=arm is_member_func_test testing.launcher=null_runner - ARGS: --toolset=gcc address-model=64 PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% - ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z 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 d7dbcc2..432af4e 100644 --- a/include/boost/type_traits/detail/is_function_cxx_11.hpp +++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp @@ -96,7 +96,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 {}; 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 22ccd02..d88a004 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 @@ -108,7 +108,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 {}; diff --git a/test/null_runner.bat b/test/null_runner.bat new file mode 100644 index 0000000..af0df74 --- /dev/null +++ b/test/null_runner.bat @@ -0,0 +1,4 @@ +REM +REM This batch file does nothing, use it to "run" something that has been cross-compiled. +REM +ECHO Skipping running program %1%