Move indirect_traits to boost/detail

dabrahams · dabrahams · commit 2f5dfbb72883 · 2004-09-15T15:00:12.000Z
[SVN r25117]
diff --git a/include/boost/python/arg_from_python.hpp b/include/boost/python/arg_from_python.hpp
@@ -7,7 +7,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 # include <boost/python/converter/arg_from_python.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
 
 namespace boost { namespace python { 
 
diff --git a/include/boost/python/converter/arg_from_python.hpp b/include/boost/python/converter/arg_from_python.hpp
@@ -157,15 +157,15 @@ struct select_arg_from_python
     
     BOOST_STATIC_CONSTANT(
         bool, ptr_cref
-            = boost::python::detail::is_reference_to_pointer<T>::value
-            && boost::python::detail::is_reference_to_const<T>::value
-            && !boost::python::detail::is_reference_to_volatile<T>::value);
+            = indirect_traits::is_reference_to_pointer<T>::value
+            && indirect_traits::is_reference_to_const<T>::value
+            && !indirect_traits::is_reference_to_volatile<T>::value);
 
     
     BOOST_STATIC_CONSTANT(
         bool, ref =
-            boost::python::detail::is_reference_to_non_const<T>::value
-        || boost::python::detail::is_reference_to_volatile<T>::value);
+            indirect_traits::is_reference_to_non_const<T>::value
+        || indirect_traits::is_reference_to_volatile<T>::value);
 
     BOOST_STATIC_CONSTANT(
         bool, back_ref =
diff --git a/include/boost/python/converter/arg_to_python.hpp b/include/boost/python/converter/arg_to_python.hpp
@@ -117,7 +117,7 @@ namespace detail
             , typename mpl::if_<
                 mpl::or_<
                     is_function<T>
-                  , python::detail::is_pointer_to_function<T>
+                  , indirect_traits::is_pointer_to_function<T>
                   , is_member_function_pointer<T>
                 >
                 , function_arg_to_python<T>
diff --git a/include/boost/python/detail/enable_if.hpp b/include/boost/python/detail/enable_if.hpp
@@ -12,6 +12,8 @@
 
 namespace boost { namespace python { namespace detail { 
 
+template <class T> struct always_void { typedef void type; };
+
 template <class C, class T = int>
 struct enable_if_arg
 {
@@ -24,13 +26,13 @@ struct disable_if_arg
     typedef typename mpl::if_<C,int&,T>::type type;
 };
              
-template <class C, class T = void>
+template <class C, class T = typename always_void<C>::type>
 struct enable_if_ret
 {
     typedef typename mpl::if_<C,T,int[2]>::type type;
 };
              
-template <class C, class T = void>
+template <class C, class T = typename always_void<C>::type>
 struct disable_if_ret
 {
     typedef typename mpl::if_<C,int[2],T>::type type;
diff --git a/include/boost/python/detail/indirect_traits.hpp b/include/boost/python/detail/indirect_traits.hpp
diff --git a/include/boost/python/detail/is_function_ref_tester.hpp b/include/boost/python/detail/is_function_ref_tester.hpp

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ namespace detail`
`117`	`117`	`, typename mpl::if_<`
`118`	`118`	`mpl::or_<`
`119`	`119`	`is_function<T>`
`120`		`- , python::detail::is_pointer_to_function<T>`
	`120`	`+ , indirect_traits::is_pointer_to_function<T>`
`121`	`121`	`, is_member_function_pointer<T>`
`122`	`122`	`>`
`123`	`123`	`, function_arg_to_python<T>`