boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-22 05:22:45 +00:00
Code Issues Projects Releases Wiki Activity

Better usage of handle<>.

Browse Source 
[SVN r19420]
This commit is contained in:
Joel de Guzman
2003-08-04 03:24:41 +00:00
parent 30ec6181b5
commit 0922aca873
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/boost/python/indexing/detail/indexing_suite_detail.hpp
View File

@@ -16,9 +16,9 @@
namespace boost { namespace python { namespace detail {
#if defined(NDEBUG)
#define CHECK_INVARIANT
#define BOOST_PYTHON_INDEXING_CHECK_INVARIANT
#else
#define CHECK_INVARIANT check_invariant()
#define BOOST_PYTHON_INDEXING_CHECK_INVARIANT check_invariant()
#endif
template <class Proxy>
@@ -76,26 +76,26 @@ namespace boost { namespace python { namespace detail {
break;
}
}
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
}
void
add(PyObject* prox)
{
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
// Add a proxy
proxies.insert(
first_proxy(extract<Proxy&>(prox)().get_index()), prox);
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
}
void
erase(index_type from, index_type to)
{
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
// Erase all proxies with indexes from..to
replace(from, to, 0);
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
}
void
@@ -104,7 +104,7 @@ namespace boost { namespace python { namespace detail {
index_type to,
typename std::vector<PyObject*>::size_type len)
{
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
// Erase all proxies with indexes from..to.
// Adjust the displaced indexes such that the
// final effect is that we have inserted *len*
@@ -139,13 +139,13 @@ namespace boost { namespace python { namespace detail {
extract<Proxy&>(*right)().get_index(), from, to, len));
++right;
}
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
}
PyObject*
find(index_type i)
{
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
// Find the proxy with *exact* index i.
// Return 0 (null) if no proxy with the
// given index is found.
@@ -153,17 +153,17 @@ namespace boost { namespace python { namespace detail {
if (iter != proxies.end()
&& extract<Proxy&>(*iter)().get_index() == i)
{
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
return *iter;
}
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
return 0;
}
typename std::vector<PyObject*>::size_type
size() const
{
CHECK_INVARIANT;
BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
// How many proxies are there so far?
return proxies.size();
}

11
include/boost/python/indexing/indexing_suite.hpp
View File

@@ -147,12 +147,8 @@ namespace boost { namespace python {
if (PyObject* shared =
container_element_t::get_links().find(container.get(), idx))
{
// return extract<object>(shared)();
handle<> h(shared);
object result(h);
h.release();
return result;
handle<> h(borrowed(shared));
return object(h);
}
else
{
@@ -314,7 +310,7 @@ namespace boost { namespace python {
else
{
// Otherwise, it must be a list or some container
handle<> l_(v);
handle<> l_(borrowed(v));
object l(l_);
std::vector<Element> temp;
@@ -348,7 +344,6 @@ namespace boost { namespace python {
temp.end()-temp.begin(), no_proxy());
DerivedPolicies::set_slice(container, from, to,
temp.begin(), temp.end());
l_.release();
}
}
}