Apply missing elements of previously-"applied" bug fix.

dabrahams · dabrahams · commit 315c3d50ee5b · 2006-09-29T15:45:29.000Z
[SVN r35421]
diff --git a/include/boost/python/detail/unwrap_wrapper.hpp b/include/boost/python/detail/unwrap_wrapper.hpp
@@ -6,42 +6,28 @@
 
 # include <boost/python/detail/prefix.hpp>
 # include <boost/python/detail/is_wrapper.hpp>
-#  if defined(BOOST_PYTHON_NO_SFINAE)
-#   include <boost/mpl/eval_if.hpp>
-#   include <boost/mpl/identity.hpp>
-#  else 
-#   include <boost/python/detail/enable_if.hpp>
-#  endif 
+# include <boost/mpl/eval_if.hpp>
+# include <boost/mpl/identity.hpp>
 
 namespace boost { namespace python { namespace detail { 
 
-#  if defined(BOOST_PYTHON_NO_SFINAE)
 template <class T>
 struct unwrap_wrapper_helper
 {
     typedef typename T::_wrapper_wrapped_type_ type;
 };
-  
-template <class T>
-typename mpl::eval_if<is_wrapper<T>,unwrap_wrapper_helper<T>,mpl::identity<T> >::type*
-unwrap_wrapper(T*)
-{
-    return 0;
-}
-#  else 
+
 template <class T>
-typename disable_if_ret<is_wrapper<T>,T*>::type
-unwrap_wrapper(T*)
-{
-    return 0;
-}
+struct unwrap_wrapper_
+  : mpl::eval_if<is_wrapper<T>,unwrap_wrapper_helper<T>,mpl::identity<T> >
+{};
 
 template <class T>
-T* unwrap_wrapper(wrapper<T>*)
+typename unwrap_wrapper_<T>::type*
+unwrap_wrapper(T*)
 {
     return 0;
 }
-#  endif 
 
 }}} // namespace boost::python::detail
 
diff --git a/include/boost/python/operators.hpp b/include/boost/python/operators.hpp
@@ -18,6 +18,7 @@
 # include <boost/python/other.hpp>
 # include <boost/lexical_cast.hpp>
 # include <boost/python/refcount.hpp>
+# include <boost/python/detail/unwrap_wrapper.hpp>
 # include <string>
 # include <complex>
 
@@ -346,7 +347,6 @@ BOOST_PYTHON_UNARY_OPERATOR(long, PyLong_FromLong, long_)
 BOOST_PYTHON_UNARY_OPERATOR(float, double, float_)
 BOOST_PYTHON_UNARY_OPERATOR(complex, std::complex<double>, complex_)
 BOOST_PYTHON_UNARY_OPERATOR(str, lexical_cast<std::string>, str)
-BOOST_PYTHON_UNARY_OPERATOR(repr, lexical_cast<std::string>, repr)
 # undef BOOST_PYTHON_UNARY_OPERATOR
 
 }} // namespace boost::python
@@ -358,7 +358,6 @@ using boost::python::self_ns::long_;
 using boost::python::self_ns::float_;
 using boost::python::self_ns::complex_;
 using boost::python::self_ns::str;
-using boost::python::self_ns::repr;
 using boost::python::self_ns::pow;
 # endif
 
