diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:30:07 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:32:57 +0900 |
commit | 71d216b90256936a9638f325af9bc69d720e75de (patch) | |
tree | 9c5f682d341c7c88ad0c8e3d4b262e00b6fb691a /boost/function_types | |
parent | 733b5d5ae2c5d625211e2985ac25728ac3f54883 (diff) | |
download | boost-71d216b90256936a9638f325af9bc69d720e75de.tar.gz boost-71d216b90256936a9638f325af9bc69d720e75de.tar.bz2 boost-71d216b90256936a9638f325af9bc69d720e75de.zip |
Imported Upstream version 1.59.0
Change-Id: I2dde00f4eca71df3eea9d251dcaecde18a6c90a5
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/function_types')
-rw-r--r-- | boost/function_types/components.hpp | 3 | ||||
-rw-r--r-- | boost/function_types/detail/classifier.hpp | 9 | ||||
-rw-r--r-- | boost/function_types/function_arity.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/function_pointer.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/function_reference.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/function_type.hpp | 1 | ||||
-rw-r--r-- | boost/function_types/is_callable_builtin.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/is_function.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/is_function_pointer.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/is_function_reference.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/is_member_function_pointer.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/is_member_object_pointer.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/is_member_pointer.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/is_nonmember_callable_builtin.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/member_function_pointer.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/member_object_pointer.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/parameter_types.hpp | 2 | ||||
-rw-r--r-- | boost/function_types/result_type.hpp | 2 |
18 files changed, 7 insertions, 36 deletions
diff --git a/boost/function_types/components.hpp b/boost/function_types/components.hpp index d348682b82..6f22098d58 100644 --- a/boost/function_types/components.hpp +++ b/boost/function_types/components.hpp @@ -15,7 +15,6 @@ #include <boost/detail/workaround.hpp> #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/type_traits/integral_constant.hpp> @@ -416,8 +415,6 @@ namespace boost } } // namespace function_types::detail - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::components) - } // namespace ::boost #include <boost/function_types/detail/components_as_mpl_sequence.hpp> diff --git a/boost/function_types/detail/classifier.hpp b/boost/function_types/detail/classifier.hpp index 03f3419b9f..b5c5e71ebe 100644 --- a/boost/function_types/detail/classifier.hpp +++ b/boost/function_types/detail/classifier.hpp @@ -11,7 +11,6 @@ #include <boost/type.hpp> #include <boost/config.hpp> -#include <boost/type_traits/config.hpp> #include <boost/type_traits/is_reference.hpp> #include <boost/type_traits/add_reference.hpp> @@ -31,7 +30,13 @@ template<bits_t Flags, bits_t CCID, std::size_t Arity> struct encode_charr >::type type; }; -char BOOST_TT_DECL classifier_impl(...); +#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32)) +# define BOOST_FT_DECL __cdecl +#else +# define BOOST_FT_DECL /**/ +#endif + +char BOOST_FT_DECL classifier_impl(...); #define BOOST_FT_variations BOOST_FT_function|BOOST_FT_pointer|\ BOOST_FT_member_pointer diff --git a/boost/function_types/function_arity.hpp b/boost/function_types/function_arity.hpp index 40f0f653cc..a81001be3f 100644 --- a/boost/function_types/function_arity.hpp +++ b/boost/function_types/function_arity.hpp @@ -13,7 +13,6 @@ #include <boost/mpl/if.hpp> #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/is_callable_builtin.hpp> #include <boost/function_types/components.hpp> @@ -31,7 +30,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(1,function_arity,(T)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::function_arity) } #endif diff --git a/boost/function_types/function_pointer.hpp b/boost/function_types/function_pointer.hpp index a8b832f32b..cb139187f0 100644 --- a/boost/function_types/function_pointer.hpp +++ b/boost/function_types/function_pointer.hpp @@ -10,7 +10,6 @@ #define BOOST_FT_FUNCTION_POINTER_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/function_type.hpp> @@ -25,7 +24,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,function_pointer,(Types,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::function_pointer) } #endif diff --git a/boost/function_types/function_reference.hpp b/boost/function_types/function_reference.hpp index 5fe7e3cc8b..3eceae00ea 100644 --- a/boost/function_types/function_reference.hpp +++ b/boost/function_types/function_reference.hpp @@ -10,7 +10,6 @@ #define BOOST_FT_FUNCTION_REFERENCE_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/function_type.hpp> @@ -25,7 +24,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,function_reference,(Types,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::function_reference) } #endif diff --git a/boost/function_types/function_type.hpp b/boost/function_types/function_type.hpp index c3b2c96b94..afe3654a7c 100644 --- a/boost/function_types/function_type.hpp +++ b/boost/function_types/function_type.hpp @@ -22,7 +22,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,function_type,(Types,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::function_type) } #endif diff --git a/boost/function_types/is_callable_builtin.hpp b/boost/function_types/is_callable_builtin.hpp index b1a7c833ba..3b826ea580 100644 --- a/boost/function_types/is_callable_builtin.hpp +++ b/boost/function_types/is_callable_builtin.hpp @@ -10,7 +10,6 @@ #define BOOST_FT_IS_CALLABLE_BUILTIN_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/components.hpp> @@ -28,7 +27,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_callable_builtin,(T,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_callable_builtin) } #endif diff --git a/boost/function_types/is_function.hpp b/boost/function_types/is_function.hpp index d29229bb69..09f75b1c18 100644 --- a/boost/function_types/is_function.hpp +++ b/boost/function_types/is_function.hpp @@ -9,7 +9,6 @@ #define BOOST_FT_IS_FUNCTION_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/components.hpp> @@ -27,7 +26,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_function,(T,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_function) } #endif diff --git a/boost/function_types/is_function_pointer.hpp b/boost/function_types/is_function_pointer.hpp index 5bff6d36d9..67a04026f4 100644 --- a/boost/function_types/is_function_pointer.hpp +++ b/boost/function_types/is_function_pointer.hpp @@ -10,7 +10,6 @@ #define BOOST_FT_IS_FUNCTION_POINTER_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/components.hpp> @@ -28,7 +27,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_function_pointer,(T,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_function_pointer) } #endif diff --git a/boost/function_types/is_function_reference.hpp b/boost/function_types/is_function_reference.hpp index f2e4c1c605..6bf908dc5d 100644 --- a/boost/function_types/is_function_reference.hpp +++ b/boost/function_types/is_function_reference.hpp @@ -10,7 +10,6 @@ #define BOOST_FT_IS_FUNCTION_REFERENCE_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/components.hpp> @@ -27,7 +26,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_function_reference,(T,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_function_reference) } #endif diff --git a/boost/function_types/is_member_function_pointer.hpp b/boost/function_types/is_member_function_pointer.hpp index a51903520b..ef547657a3 100644 --- a/boost/function_types/is_member_function_pointer.hpp +++ b/boost/function_types/is_member_function_pointer.hpp @@ -10,7 +10,6 @@ #define BOOST_FT_IS_MEMBER_FUNCTION_POINTER_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/components.hpp> @@ -27,7 +26,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_member_function_pointer,(T,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_member_function_pointer) } #endif diff --git a/boost/function_types/is_member_object_pointer.hpp b/boost/function_types/is_member_object_pointer.hpp index 77527d9a3d..10bc89a163 100644 --- a/boost/function_types/is_member_object_pointer.hpp +++ b/boost/function_types/is_member_object_pointer.hpp @@ -10,7 +10,6 @@ #define BOOST_FT_IS_MEMBER_OBJECT_POINTER_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/components.hpp> @@ -27,7 +26,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_member_object_pointer,(T)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::is_member_object_pointer) } #endif diff --git a/boost/function_types/is_member_pointer.hpp b/boost/function_types/is_member_pointer.hpp index f53e0beb71..db1da29dc4 100644 --- a/boost/function_types/is_member_pointer.hpp +++ b/boost/function_types/is_member_pointer.hpp @@ -9,7 +9,6 @@ #define BOOST_FT_IS_MEMBER_POINTER_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/components.hpp> @@ -27,7 +26,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_member_pointer,(T,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_member_pointer) } #endif diff --git a/boost/function_types/is_nonmember_callable_builtin.hpp b/boost/function_types/is_nonmember_callable_builtin.hpp index 3a27a2e7f7..61052858b7 100644 --- a/boost/function_types/is_nonmember_callable_builtin.hpp +++ b/boost/function_types/is_nonmember_callable_builtin.hpp @@ -10,7 +10,6 @@ #define BOOST_FT_IS_NONMEMBER_CALLABLE_BUILTIN_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/components.hpp> @@ -28,7 +27,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_nonmember_callable_builtin,(T,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_nonmember_callable_builtin) } #endif diff --git a/boost/function_types/member_function_pointer.hpp b/boost/function_types/member_function_pointer.hpp index eab61118cb..104271f103 100644 --- a/boost/function_types/member_function_pointer.hpp +++ b/boost/function_types/member_function_pointer.hpp @@ -10,7 +10,6 @@ #define BOOST_FT_MEMBER_FUNCTION_POINTER_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/detail/synthesize.hpp> #include <boost/function_types/detail/to_sequence.hpp> @@ -26,7 +25,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,member_function_pointer,(Types,Tag)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::member_function_pointer) } #endif diff --git a/boost/function_types/member_object_pointer.hpp b/boost/function_types/member_object_pointer.hpp index d0aa3f3418..1951654550 100644 --- a/boost/function_types/member_object_pointer.hpp +++ b/boost/function_types/member_object_pointer.hpp @@ -10,7 +10,6 @@ #define BOOST_FT_MEMBER_OBJECT_POINTER_HPP_INCLUDED #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/function_types/detail/synthesize.hpp> #include <boost/function_types/detail/to_sequence.hpp> @@ -26,7 +25,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(1,member_object_pointer,(Types)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::member_object_pointer) } #endif diff --git a/boost/function_types/parameter_types.hpp b/boost/function_types/parameter_types.hpp index 5e049bf59c..227ad27325 100644 --- a/boost/function_types/parameter_types.hpp +++ b/boost/function_types/parameter_types.hpp @@ -13,7 +13,6 @@ #include <boost/mpl/if.hpp> #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/mpl/pop_front.hpp> @@ -48,7 +47,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(2,parameter_types,(T,ClassTypeTransform)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::parameter_types) } #endif diff --git a/boost/function_types/result_type.hpp b/boost/function_types/result_type.hpp index 1fcaba6622..db642c88c6 100644 --- a/boost/function_types/result_type.hpp +++ b/boost/function_types/result_type.hpp @@ -13,7 +13,6 @@ #include <boost/mpl/if.hpp> #include <boost/mpl/aux_/lambda_support.hpp> -#include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/mpl/at.hpp> @@ -43,7 +42,6 @@ namespace boost BOOST_MPL_AUX_LAMBDA_SUPPORT(1,result_type,(T)) }; } - BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::result_type) } #endif |