From 0c9643ee884439aad7b5710d5df7751bf401ed8c Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sat, 11 Aug 2018 19:51:10 +0100 Subject: [PATCH] Disable some partial specializations in x64 mode. --- include/boost/type_traits/is_function.hpp | 24 +++++++ .../is_member_function_pointer.hpp | 72 ++++++++++++------- 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/include/boost/type_traits/is_function.hpp b/include/boost/type_traits/is_function.hpp index da3e1f9..e22b758 100644 --- a/include/boost/type_traits/is_function.hpp +++ b/include/boost/type_traits/is_function.hpp @@ -105,10 +105,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; // const: @@ -116,10 +118,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; // volatile: @@ -127,10 +131,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; // const volatile: @@ -138,10 +144,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; @@ -150,10 +158,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; // const: @@ -161,10 +171,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; // volatile: @@ -172,10 +184,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; // const volatile: @@ -183,10 +197,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; @@ -195,10 +211,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; // const: @@ -206,10 +224,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; // volatile: @@ -217,10 +237,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; // const volatile: @@ -228,10 +250,12 @@ namespace boost { template struct is_function : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_function : public true_type {}; template struct is_function : public true_type {}; +#endif template struct is_function : public true_type {}; diff --git a/include/boost/type_traits/is_member_function_pointer.hpp b/include/boost/type_traits/is_member_function_pointer.hpp index 86cd070..5896c8f 100644 --- a/include/boost/type_traits/is_member_function_pointer.hpp +++ b/include/boost/type_traits/is_member_function_pointer.hpp @@ -119,159 +119,183 @@ namespace boost { template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; - template struct is_member_function_pointer : public true_type {}; +#endif + template + struct is_member_function_pointer : public true_type {}; // const: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; // volatile: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; // const volatile: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; // reference qualified: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; // const: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; // volatile: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; // const volatile: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; // rvalue reference qualified: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; // const: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; // volatile: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; // const volatile: #ifdef __CLR_VER template struct is_member_function_pointer : public true_type {}; #endif +#ifndef _M_AMD64 template struct is_member_function_pointer : public true_type {}; template struct is_member_function_pointer : public true_type {}; template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; +#endif template - struct is_member_function_pointer : public true_type {}; + struct is_member_function_pointer : public true_type {}; #endif }