buckaroo-pm
diff --git a/‎include/boost/python/override.hpp‎
Lines changed: 1 addition & 1 deletion b/‎include/boost/python/override.hpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎include/boost/python/wrapper.hpp‎
Lines changed: 2 additions & 1 deletion b/‎include/boost/python/wrapper.hpp‎
Lines changed: 2 additions & 1 deletion
@@ -33,7 +33,7 @@ namespace detail
   class method_result
   {
    private:
-      friend class override;
+      friend class boost::python::override;
       explicit method_result(PyObject* x)
         : m_obj(x)
       {}
 
@@ -15,12 +15,13 @@ template <class T>
 class wrapper : public detail::wrapper_base
 {
 #   if defined(BOOST_PYTHON_NO_SFINAE)
+ public:
     typedef T _wrapper_wrapped_type_;
 #   endif 
  protected:
     override get_override(char const* name) const
     {
-        return this->wrapper_base::get_override(
+        return this->detail::wrapper_base::get_override(
             name, converter::registered<T>::converters.get_class_object());
     }
 };
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ namespace detail`
`33`	`33`	`class method_result`
`34`	`34`	`{`
`35`	`35`	`private:`
`36`		`- friend class override;`
	`36`	`+ friend class boost::python::override;`
`37`	`37`	`explicit method_result(PyObject* x)`
`38`	`38`	`: m_obj(x)`
`39`	`39`	`{}`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,13 @@ template <class T>`
`15`	`15`	`class wrapper : public detail::wrapper_base`
`16`	`16`	`{`
`17`	`17`	`# if defined(BOOST_PYTHON_NO_SFINAE)`
	`18`	`+ public:`
`18`	`19`	`typedef T _wrapper_wrapped_type_;`
`19`	`20`	`# endif`
`20`	`21`	`protected:`
`21`	`22`	`override get_override(char const* name) const`
`22`	`23`	`{`
`23`		`- return this->wrapper_base::get_override(`
	`24`	`+ return this->detail::wrapper_base::get_override(`
`24`	`25`	`name, converter::registered<T>::converters.get_class_object());`
`25`	`26`	`}`
`26`	`27`	`};`