scope default constructor gets current scope; killed scope::get()

dabrahams · dabrahams · commit 8763fd1c53e4 · 2002-07-25T14:52:11.000Z
[SVN r14599]
diff --git a/include/boost/python/scope.hpp b/include/boost/python/scope.hpp
@@ -16,8 +16,8 @@ class BOOST_PYTHON_DECL scope : public object, noncopyable
 {
  public:
     inline scope(object const&);
+    inline scope();
     inline ~scope();
-    static inline object get();
     
  private: // data members
     PyObject* m_previous_scope;
@@ -35,15 +35,18 @@ inline scope::scope(object const& new_scope)
     current_scope = python::incref(new_scope.ptr());
 }
 
-inline scope::~scope()
+inline scope::scope()
+    : object(detail::borrowed_reference(
+                 current_scope
+                 ))
+      , m_previous_scope(python::incref(current_scope))
 {
-    python::decref(current_scope);
-    current_scope = m_previous_scope;
 }
 
-inline object scope::get()
+inline scope::~scope()
 {
-    return object(detail::borrowed_reference(current_scope));
+    python::decref(current_scope);
+    current_scope = m_previous_scope;
 }
 
 namespace converter
diff --git a/src/module.cpp b/src/module.cpp
@@ -19,7 +19,7 @@ namespace boost { namespace python { namespace detail {
 module_base::module_base(const char* name)
     : m_module(
         allow_null(python::borrowed(
-                       scope::get().ptr()
+                       scope().ptr()
                        )))
 {
 }
@@ -94,6 +94,6 @@ BOOST_PYTHON_DECL void init_module(char const* name, void(*init_function)())
 
 namespace boost { namespace python {
 
-BOOST_PYTHON_DECL PyObject* scope::current_scope;
+BOOST_PYTHON_DECL PyObject* scope::current_scope = Py_None;
 
 }}

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ class BOOST_PYTHON_DECL scope : public object, noncopyable`
`16`	`16`	`{`
`17`	`17`	`public:`
`18`	`18`	`inline scope(object const&);`
	`19`	`+ inline scope();`
`19`	`20`	`inline ~scope();`
`20`		`- static inline object get();`
`21`	`21`
`22`	`22`	`private: // data members`
`23`	`23`	`PyObject* m_previous_scope;`
`@@ -35,15 +35,18 @@ inline scope::scope(object const& new_scope)`
`35`	`35`	`current_scope = python::incref(new_scope.ptr());`
`36`	`36`	`}`
`37`	`37`
`38`		`-inline scope::~scope()`
	`38`	`+inline scope::scope()`
	`39`	`+ : object(detail::borrowed_reference(`
	`40`	`+ current_scope`
	`41`	`+ ))`
	`42`	`+ , m_previous_scope(python::incref(current_scope))`
`39`	`43`	`{`
`40`		`- python::decref(current_scope);`
`41`		`- current_scope = m_previous_scope;`
`42`	`44`	`}`
`43`	`45`
`44`		`-inline object scope::get()`
	`46`	`+inline scope::~scope()`
`45`	`47`	`{`
`46`		`- return object(detail::borrowed_reference(current_scope));`
	`48`	`+ python::decref(current_scope);`
	`49`	`+ current_scope = m_previous_scope;`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`namespace converter`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace boost { namespace python { namespace detail {`
`19`	`19`	`module_base::module_base(const char* name)`
`20`	`20`	`: m_module(`
`21`	`21`	`allow_null(python::borrowed(`
`22`		`- scope::get().ptr()`
	`22`	`+ scope().ptr()`
`23`	`23`	`)))`
`24`	`24`	`{`
`25`	`25`	`}`
`@@ -94,6 +94,6 @@ BOOST_PYTHON_DECL void init_module(char const* name, void(*init_function)())`
`94`	`94`
`95`	`95`	`namespace boost { namespace python {`
`96`	`96`
`97`		`-BOOST_PYTHON_DECL PyObject* scope::current_scope;`
	`97`	`+BOOST_PYTHON_DECL PyObject* scope::current_scope = Py_None;`
`98`	`98`
`99`	`99`	`}}`