back_reference<> uses object instead of handle<>

dabrahams · dabrahams · commit 30ef9c6418ec · 2002-07-25T15:20:06.000Z
[SVN r14600]
diff --git a/include/boost/python/back_reference.hpp b/include/boost/python/back_reference.hpp
@@ -7,6 +7,7 @@
 # define BACK_REFERENCE_DWA2002510_HPP
 
 # include <boost/python/handle.hpp>
+# include <boost/python/object_core.hpp>
 
 namespace boost { namespace python { 
 
@@ -17,10 +18,10 @@ struct back_reference
     typedef T type;
     
     back_reference(PyObject*, T);
-    handle<> reference() const;
+    object const& source() const;
     T get() const;
  private:
-    handle<> m_reference;
+    object m_source;
     T m_value;
 };
 
@@ -75,15 +76,15 @@ class is_back_reference
 //
 template <class T>
 back_reference<T>::back_reference(PyObject* p, T x)
-    : m_reference(python::borrowed(p))
+    : m_source(detail::borrowed_reference(p))
       , m_value(x)
 {
 }
 
 template <class T>
-handle<> back_reference<T>::reference() const
+object const& back_reference<T>::source() const
 {
-    return m_reference;
+    return m_source;
 }
 
 template <class T>
diff --git a/include/boost/python/operators2.hpp b/include/boost/python/operators2.hpp
@@ -15,6 +15,7 @@
 # include <boost/python/self.hpp>
 # include <boost/python/other.hpp>
 # include <boost/lexical_cast.hpp>
+# include <boost/python/refcount.hpp>
 # include <string>
 # include <complex>
 
@@ -251,7 +252,7 @@ namespace detail                                                \
           execute(back_reference<L&> l, R const& r)             \
           {                                                     \
               l.get() op r;                                     \
-              return l.reference().release();                   \
+              return python::incref(l.source().ptr());          \
           }                                                     \
       };                                                        \
       static char const* name() { return "__" #id "__"; }       \
diff --git a/test/back_reference.cpp b/test/back_reference.cpp
@@ -75,9 +75,9 @@ namespace boost { namespace python
 }}
 
 // prove that back_references get initialized with the right PyObject*
-PyObject* y_identity(back_reference<Y const&> y)
+object y_identity(back_reference<Y const&> y)
 {
-    return y.reference().release();
+    return y.source();
 }
 
 // prove that back_references contain the right value

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,9 @@ namespace boost { namespace python`
`75`	`75`	`}}`
`76`	`76`
`77`	`77`	`// prove that back_references get initialized with the right PyObject*`
`78`		`-PyObject* y_identity(back_reference<Y const&> y)`
	`78`	`+object y_identity(back_reference<Y const&> y)`
`79`	`79`	`{`
`80`		`- return y.reference().release();`
	`80`	`+ return y.source();`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// prove that back_references contain the right value`