Python: Simplify object_operators implementation.

steveire · steveire · commit 5476f97d597e · 2013-09-25T11:20:43.000Z
The old-MSVC-specific version is no longer needed.

[SVN r85898]
diff --git a/include/boost/python/object_core.hpp b/include/boost/python/object_core.hpp
@@ -36,12 +36,6 @@
 # include <boost/type_traits/is_convertible.hpp>
 # include <boost/type_traits/remove_reference.hpp>
 
-# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-#  include <boost/type_traits/add_pointer.hpp>
-# endif
-
-# include <boost/mpl/if.hpp>
-
 namespace boost { namespace python { 
 
 namespace detail
@@ -98,11 +92,7 @@ namespace api
   class object_operators : public def_visitor<U>
   {
    protected:
-# if !defined(BOOST_MSVC) || BOOST_MSVC >= 1300
       typedef object const& object_cref;
-# else 
-      typedef object object_cref;
-# endif
    public:
       // function call
       //
@@ -139,25 +129,11 @@ namespace api
     
       template <class T>
       const_object_item
-      operator[](T const& key) const
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-          ;
-# else 
-      {
-          return (*this)[object(key)];
-      }
-# endif 
+      operator[](T const& key) const;
     
       template <class T>
       object_item
-      operator[](T const& key)
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-          ;
-# else 
-      {
-          return (*this)[object(key)];
-      }
-# endif
+      operator[](T const& key);
 
       // slicing
       //
@@ -175,29 +151,11 @@ namespace api
 
       template <class T, class V>
       const_object_slice
-      slice(T const& start, V const& end) const
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-          ;
-# else
-      {
-          return this->slice(
-               slice_bound<T>::type(start)
-              ,  slice_bound<V>::type(end));
-      }
-# endif
+      slice(T const& start, V const& end) const;
     
       template <class T, class V>
       object_slice
-      slice(T const& start, V const& end)
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-          ;
-# else
-      {
-          return this->slice(
-              slice_bound<T>::type(start)
-              , slice_bound<V>::type(end));
-      }
-# endif
+      slice(T const& start, V const& end);
       
    private: // def visitation for adding callable objects as class methods
       
@@ -323,14 +281,7 @@ namespace api
       
       // explicit conversion from any C++ object to Python
       template <class T>
-      explicit object(
-          T const& x
-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-          // use some SFINAE to un-confuse MSVC about its
-          // copy-initialization ambiguity claim.
-        , typename mpl::if_<is_proxy<T>,int&,int>::type* = 0
-# endif 
-      )
+      explicit object(T const& x)
         : object_base(object_base_initializer(x))
       {
       }
diff --git a/include/boost/python/object_items.hpp b/include/boost/python/object_items.hpp
@@ -44,7 +44,6 @@ object_operators<U>::operator[](object_cref key) const
     return const_object_item(x, key);
 }
 
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
 template <class U>
 template <class T>
 inline const_object_item
@@ -60,8 +59,6 @@ object_operators<U>::operator[](T const& key)
 {
     return (*this)[object(key)];
 }
-# endif 
-
 
 inline object const_item_policies::get(object const& target, object const& key)
 {
diff --git a/include/boost/python/object_slices.hpp b/include/boost/python/object_slices.hpp
@@ -99,7 +99,7 @@ object_operators<U>::slice(object_cref start, slice_nil) const
     object_cref2 x = *static_cast<U const*>(this);
     return const_object_slice(x, api::slice_key(borrowed(start.ptr()), allow_null((PyObject*)0)));
 }
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
+
 template <class U>
 template <class T, class V>
 inline const_object_slice
@@ -119,8 +119,6 @@ object_operators<U>::slice(T const& start, V const& end)
         typename slice_bound<T>::type(start)
         , typename slice_bound<V>::type(end));
 }
-# endif 
-
 
 inline object const_slice_policies::get(object const& target, key_type const& key)
 {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ object_operators<U>::operator[](object_cref key) const`
`44`	`44`	`return const_object_item(x, key);`
`45`	`45`	`}`
`46`	`46`
`47`		`-# if !defined(BOOST_MSVC) \|\| BOOST_MSVC > 1300`
`48`	`47`	`template <class U>`
`49`	`48`	`template <class T>`
`50`	`49`	`inline const_object_item`
`@@ -60,8 +59,6 @@ object_operators<U>::operator[](T const& key)`
`60`	`59`	`{`
`61`	`60`	`return (*this)[object(key)];`
`62`	`61`	`}`
`63`		`-# endif`
`64`		`-`
`65`	`62`
`66`	`63`	`inline object const_item_policies::get(object const& target, object const& key)`
`67`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ object_operators<U>::slice(object_cref start, slice_nil) const`
`99`	`99`	`object_cref2 x = static_cast<U const>(this);`
`100`	`100`	`return const_object_slice(x, api::slice_key(borrowed(start.ptr()), allow_null((PyObject*)0)));`
`101`	`101`	`}`
`102`		`-# if !defined(BOOST_MSVC) \|\| BOOST_MSVC > 1300`
	`102`	`+`
`103`	`103`	`template <class U>`
`104`	`104`	`template <class T, class V>`
`105`	`105`	`inline const_object_slice`
`@@ -119,8 +119,6 @@ object_operators<U>::slice(T const& start, V const& end)`
`119`	`119`	`typename slice_bound<T>::type(start)`
`120`	`120`	`, typename slice_bound<V>::type(end));`
`121`	`121`	`}`
`122`		`-# endif`
`123`		`-`
`124`	`122`
`125`	`123`	`inline object const_slice_policies::get(object const& target, key_type const& key)`
`126`	`124`	`{`