Extended CWPro8 overload ambiguity workaround to cover make_setter as

dabrahams · dabrahams · commit c3b4b58075f6 · 2003-08-10T22:50:38.000Z
well as make_getter.


[SVN r19519]
diff --git a/include/boost/python/data_members.hpp b/include/boost/python/data_members.hpp
@@ -261,7 +261,7 @@ namespace detail
   
   // Handle non-member pointers
   template <class D, class Policies>
-  inline object make_setter(D* p, Policies const& policies, int)
+  inline object make_setter(D* p, Policies const& policies, mpl::false_, int)
   {
       return objects::function_object(
           objects::py_function(
@@ -275,7 +275,7 @@ namespace detail
 
   // Handle pointers-to-members
   template <class C, class D, class Policies>
-  inline object make_setter(D C::*pm, Policies const& policies, int)
+  inline object make_setter(D C::*pm, Policies const& policies, mpl::true_, int)
   {
       return objects::function_object(
           objects::py_function(
@@ -289,9 +289,9 @@ namespace detail
 
   // Handle references
   template <class D, class Policies>
-  inline object make_setter(D& x, Policies const& policies, ...)
+  inline object make_setter(D& x, Policies const& policies, mpl::false_, ...)
   {
-      return detail::make_setter(&x, policies, 0L);
+      return detail::make_setter(&x, policies, mpl::false_(), 0L);
   }
 }
 
@@ -340,13 +340,13 @@ inline object make_getter(D const& d)
 template <class D, class Policies>
 inline object make_setter(D& x, Policies const& policies)
 {
-    return detail::make_setter(x, policies, 0);
+    return detail::make_setter(x, policies, is_member_pointer<D>(), 0);
 }
 
 template <class D, class Policies>
 inline object make_setter(D const& x, Policies const& policies)
 {
-    return detail::make_setter(x, policies, 0);
+    return detail::make_setter(x, policies, is_member_pointer<D>(), 0);
 }
 
 template <class D>

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ namespace detail`
`261`	`261`
`262`	`262`	`// Handle non-member pointers`
`263`	`263`	`template <class D, class Policies>`
`264`		`- inline object make_setter(D* p, Policies const& policies, int)`
	`264`	`+ inline object make_setter(D* p, Policies const& policies, mpl::false_, int)`
`265`	`265`	`{`
`266`	`266`	`return objects::function_object(`
`267`	`267`	`objects::py_function(`
`@@ -275,7 +275,7 @@ namespace detail`
`275`	`275`
`276`	`276`	`// Handle pointers-to-members`
`277`	`277`	`template <class C, class D, class Policies>`
`278`		`- inline object make_setter(D C::*pm, Policies const& policies, int)`
	`278`	`+ inline object make_setter(D C::*pm, Policies const& policies, mpl::true_, int)`
`279`	`279`	`{`
`280`	`280`	`return objects::function_object(`
`281`	`281`	`objects::py_function(`
`@@ -289,9 +289,9 @@ namespace detail`
`289`	`289`
`290`	`290`	`// Handle references`
`291`	`291`	`template <class D, class Policies>`
`292`		`- inline object make_setter(D& x, Policies const& policies, ...)`
	`292`	`+ inline object make_setter(D& x, Policies const& policies, mpl::false_, ...)`
`293`	`293`	`{`
`294`		`- return detail::make_setter(&x, policies, 0L);`
	`294`	`+ return detail::make_setter(&x, policies, mpl::false_(), 0L);`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`
`@@ -340,13 +340,13 @@ inline object make_getter(D const& d)`
`340`	`340`	`template <class D, class Policies>`
`341`	`341`	`inline object make_setter(D& x, Policies const& policies)`
`342`	`342`	`{`
`343`		`- return detail::make_setter(x, policies, 0);`
	`343`	`+ return detail::make_setter(x, policies, is_member_pointer<D>(), 0);`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`template <class D, class Policies>`
`347`	`347`	`inline object make_setter(D const& x, Policies const& policies)`
`348`	`348`	`{`
`349`		`- return detail::make_setter(x, policies, 0);`
	`349`	`+ return detail::make_setter(x, policies, is_member_pointer<D>(), 0);`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`template <class D>`