diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:24:46 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:25:39 +0900 |
| commit | 4fadd968fa12130524c8380f33fcfe25d4de79e5 (patch) | |
| tree | fd26a490cd15388d42fc6652b3c5c13012e7f93e /boost/python/detail/caller.hpp | |
| parent | b5c87084afaef42b2d058f68091be31988a6a874 (diff) | |
| download | boost-upstream/1.65.0.tar.gz boost-upstream/1.65.0.tar.bz2 boost-upstream/1.65.0.zip | |
Imported Upstream version 1.65.0upstream/1.65.0
Change-Id: Icf8400b375482cb11bcf77440a6934ba360d6ba4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/python/detail/caller.hpp')
| -rw-r--r-- | boost/python/detail/caller.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/boost/python/detail/caller.hpp b/boost/python/detail/caller.hpp index e479bf427d..c572d35aa9 100644 --- a/boost/python/detail/caller.hpp +++ b/boost/python/detail/caller.hpp @@ -16,6 +16,7 @@ # include <boost/python/detail/invoke.hpp> # include <boost/python/detail/signature.hpp> # include <boost/python/detail/preprocessor.hpp> +# include <boost/python/detail/type_traits.hpp> # include <boost/python/arg_from_python.hpp> # include <boost/python/converter/context_result_converter.hpp> @@ -31,9 +32,6 @@ # include <boost/compressed_pair.hpp> -# include <boost/type_traits/is_same.hpp> -# include <boost/type_traits/is_convertible.hpp> - # include <boost/mpl/apply.hpp> # include <boost/mpl/eval_if.hpp> # include <boost/mpl/identity.hpp> @@ -236,7 +234,7 @@ struct caller_arity<N> typedef typename select_result_converter<Policies, rtype>::type result_converter; static const signature_element ret = { - (boost::is_void<rtype>::value ? "void" : type_id<rtype>().name()) + (is_void<rtype>::value ? "void" : type_id<rtype>().name()) , &detail::converter_target_type<result_converter>::get_pytype , boost::detail::indirect_traits::is_reference_to_non_const<rtype>::value }; |