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 3031130..102513b 100644 --- a/include/boost/type_traits/detail/is_function_cxx_11.hpp +++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp @@ -107,8 +107,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const: #ifdef __CLR_VER template @@ -120,8 +122,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template @@ -133,8 +137,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template @@ -146,8 +152,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // reference qualified: #ifdef __CLR_VER @@ -160,8 +168,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const: #ifdef __CLR_VER template @@ -173,8 +183,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template @@ -186,8 +198,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template @@ -199,8 +213,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // rvalue reference qualified: #ifdef __CLR_VER @@ -213,8 +229,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const: #ifdef __CLR_VER template @@ -226,8 +244,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template @@ -239,8 +259,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template @@ -252,8 +274,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif #endif // _MSC_VER @@ -339,8 +363,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const: #ifdef __CLR_VER template @@ -352,8 +378,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template @@ -365,8 +393,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template @@ -378,8 +408,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // reference qualified: #ifdef __CLR_VER @@ -392,8 +424,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const: #ifdef __CLR_VER template @@ -405,8 +439,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template @@ -418,8 +454,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template @@ -431,8 +469,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // rvalue reference qualified: #ifdef __CLR_VER @@ -445,8 +485,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const: #ifdef __CLR_VER template @@ -458,8 +500,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template @@ -471,8 +515,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template @@ -484,8 +530,10 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef __CLR_VER template struct is_function : public true_type {}; +#endif #endif // _MSC_VER diff --git a/include/boost/type_traits/detail/is_function_ptr_tester.hpp b/include/boost/type_traits/detail/is_function_ptr_tester.hpp index f39bbd8..4d9ce79 100644 --- a/include/boost/type_traits/detail/is_function_ptr_tester.hpp +++ b/include/boost/type_traits/detail/is_function_ptr_tester.hpp @@ -52,7 +52,7 @@ yes_type is_function_ptr_tester(R(*)(...)); #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)()); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)()); #endif @@ -72,7 +72,7 @@ yes_type is_function_ptr_tester(R(*)(T0 ...)); #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0)); #endif @@ -92,7 +92,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1 ...)); #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1)); #endif @@ -112,7 +112,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2 ...)); #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2)); #endif @@ -132,7 +132,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3 ...)); #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3)); #endif @@ -152,7 +152,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4 ...)); #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4)); #endif @@ -172,7 +172,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5 ...)); #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5)); #endif @@ -192,7 +192,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6 ...)); #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6)); #endif @@ -212,7 +212,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7 ...)); #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7)); #endif @@ -232,7 +232,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8 ...)); #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8)); #endif @@ -252,7 +252,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9 ...) #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9)); #endif @@ -272,7 +272,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10)); #endif @@ -292,7 +292,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11)); #endif @@ -312,7 +312,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12)); #endif @@ -332,7 +332,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13)); #endif @@ -352,7 +352,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14)); #endif @@ -372,7 +372,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15)); #endif @@ -392,7 +392,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16)); #endif @@ -412,7 +412,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17)); #endif @@ -432,7 +432,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18)); #endif @@ -452,7 +452,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19)); #endif @@ -472,7 +472,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20)); #endif @@ -492,7 +492,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21)); #endif @@ -512,7 +512,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22)); #endif @@ -532,7 +532,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23)); #endif @@ -552,7 +552,7 @@ yes_type is_function_ptr_tester(R(*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 #ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R(__stdcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24)); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24)); #endif @@ -593,7 +593,7 @@ yes_type is_function_ptr_tester(R (*)(BOOST_PP_ENUM_PARAMS(BOOST_PP_COUNTER,T) . @#ifdef BOOST_TT_TEST_MS_FUNC_SIGS template yes_type is_function_ptr_tester(R (__stdcall*)(BOOST_PP_ENUM_PARAMS(BOOST_PP_COUNTER,T))); -@#if _MSC_VER >= 1800 +@#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_function_ptr_tester(R(__vectorcall*)(BOOST_PP_ENUM_PARAMS(BOOST_PP_COUNTER, T))); @#endif diff --git a/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp b/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp index be646f2..409e268 100644 --- a/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp +++ b/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp @@ -69,7 +69,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)() volatile); template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)() const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)()); template @@ -125,7 +125,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0) volatile); template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0)); template @@ -181,7 +181,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1) volatile); template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1)); template @@ -237,7 +237,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2) volatile); template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2)); template @@ -293,7 +293,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3) volatile); template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3)); template @@ -349,7 +349,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4) volatile); template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4)); template @@ -405,7 +405,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5)); template @@ -461,7 +461,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6)); template @@ -517,7 +517,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7)); template @@ -573,7 +573,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8)); template @@ -629,7 +629,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9)); template @@ -685,7 +685,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10)); template @@ -741,7 +741,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11)); template @@ -797,7 +797,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12)); template @@ -853,7 +853,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13)); template @@ -909,7 +909,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14)); template @@ -965,7 +965,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15)); template @@ -1021,7 +1021,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16)); template @@ -1077,7 +1077,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17)); template @@ -1133,7 +1133,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18)); template @@ -1189,7 +1189,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19)); template @@ -1245,7 +1245,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20)); template @@ -1301,7 +1301,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21)); template @@ -1357,7 +1357,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22)); template @@ -1413,7 +1413,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23)); template @@ -1469,7 +1469,7 @@ template yes_type is_mem_fun_pointer_tester(R(__stdcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24) const volatile); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R(__vectorcall T::*const volatile*)(T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24)); template @@ -1557,7 +1557,7 @@ yes_type is_mem_fun_pointer_tester(R (__stdcall T::*const volatile*)(BOOST_PP_EN template yes_type is_mem_fun_pointer_tester(R (__stdcall T::*const volatile*)(BOOST_PP_ENUM_PARAMS(BOOST_PP_COUNTER,T)) const volatile); -@#if _MSC_VER >= 1800 +@#if (_MSC_VER >= 1800) && !defined(__CLR_VER) template yes_type is_mem_fun_pointer_tester(R (__vectorcall T::*const volatile*)(BOOST_PP_ENUM_PARAMS(BOOST_PP_COUNTER,T))); 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 b77a4a5..aa205bb 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 @@ -111,7 +111,7 @@ namespace boost { #ifdef _MSC_VER #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -121,12 +121,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -136,12 +138,16 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifdef __CLR_VER +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif +#endif // volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -151,12 +157,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -166,13 +174,15 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // reference qualified: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -182,12 +192,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -197,12 +209,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -212,12 +226,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -227,13 +243,15 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // rvalue reference qualified: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -243,12 +261,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -258,12 +278,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -273,12 +295,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -288,9 +312,11 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#endif #if defined(_MSVC_LANG) && (_MSVC_LANG >= 201703) @@ -365,7 +391,7 @@ namespace boost { #ifdef _MSC_VER #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -375,12 +401,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -390,12 +418,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -405,12 +435,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -420,13 +452,15 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // reference qualified: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -436,12 +470,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -451,12 +487,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -466,12 +504,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -481,13 +521,15 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // rvalue reference qualified: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -497,12 +539,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -512,12 +556,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -527,12 +573,14 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; +#endif // const volatile: #ifdef __CLR_VER template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif #ifndef _M_AMD64 template @@ -542,9 +590,11 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#endif #endif diff --git a/test/is_function_test.cpp b/test/is_function_test.cpp index 1c9c74f..be552b0 100644 --- a/test/is_function_test.cpp +++ b/test/is_function_test.cpp @@ -99,7 +99,7 @@ typedef void __fastcall ffoo1_t(int); typedef void __fastcall ffoo2_t(int&, double); typedef void __fastcall ffoo3_t(int&, bool, int, int); typedef void __fastcall ffoo4_t(int, bool, int*, int[], int, int, int, int, int); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) typedef void __vectorcall vfoo0_t(); typedef void __vectorcall vfoo1_t(int); typedef void __vectorcall vfoo2_t(int&, double); @@ -124,7 +124,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_function::value, true); BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_function::value, true); BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_function::value, true); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_function::value, true); BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_function::value, true); BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_function::value, true); diff --git a/test/is_member_func_test.cpp b/test/is_member_func_test.cpp index 5b967bf..61d6597 100644 --- a/test/is_member_func_test.cpp +++ b/test/is_member_func_test.cpp @@ -74,7 +74,7 @@ typedef void (__fastcall test_abc1::*fcall_proc)(int); BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_member_function_pointer::value, true); typedef void (__cdecl test_abc1::*ccall_proc)(int, long, double); BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_member_function_pointer::value, true); -#if _MSC_VER >= 1800 +#if (_MSC_VER >= 1800) && !defined(__CLR_VER) typedef void(__vectorcall test_abc1::*vcall_proc)(int, long, double, double, double, double); BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_member_function_pointer::value, true); #endif