boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-27 19:12:16 +00:00
Code Issues Projects Releases Wiki Activity

Getter setter bugfixes for attribute access

Browse Source 
[SVN r18486]
This commit is contained in:
Dave Abrahams
2003-05-21 21:52:26 +00:00
parent 622636dcf1
commit 2f1b828967
2 changed files with 59 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
include/boost/python/class.hpp
View File

@@ -46,7 +46,11 @@
# include <boost/utility.hpp>
# include <boost/detail/workaround.hpp>
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004)
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004) || BOOST_WORKAROUND(__GNUC__, < 3)
# define BOOST_PYTHON_NO_MEMBER_POINTER_ORDERING 1
# endif
# ifdef BOOST_PYTHON_NO_MEMBER_POINTER_ORDERING
# include <boost/mpl/and.hpp>
# include <boost/type_traits/is_member_pointer.hpp>
# endif
@@ -102,7 +106,7 @@ namespace detail
SelectHolder::register_();
}
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004)
# ifdef BOOST_PYTHON_NO_MEMBER_POINTER_ORDERING
template <class T>
struct is_data_member_pointer
: mpl::and_<
@@ -110,6 +114,17 @@ namespace detail
, mpl::not_<is_member_function_pointer<T> >
>
{};
# define BOOST_PYTHON_DATA_MEMBER_HELPER , detail::is_data_member_pointer<D>()
# define BOOST_PYTHON_YES_DATA_MEMBER , mpl::true_
# define BOOST_PYTHON_NO_DATA_MEMBER , mpl::false_
# elif defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
# define BOOST_PYTHON_DATA_MEMBER_HELPER , 0
# define BOOST_PYTHON_YES_DATA_MEMBER , int
# define BOOST_PYTHON_NO_DATA_MEMBER , ...
# else
# define BOOST_PYTHON_DATA_MEMBER_HELPER
# define BOOST_PYTHON_YES_DATA_MEMBER
# define BOOST_PYTHON_NO_DATA_MEMBER
# endif
namespace error
@@ -308,53 +323,25 @@ class class_ : public objects::class_base
template <class D>
self& def_readonly(char const* name, D const& d)
{
return this->def_readonly_impl(
name, d
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004)
, detail::is_data_member_pointer<D>()
# elif BOOST_NO_FUNCTION_TEMPLATE_ORDERING
, 0
# endif
);
return this->def_readonly_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER);
}
template <class D>
self& def_readwrite(char const* name, D const& d)
{
return this->def_readwrite_impl(
name, d
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004)
, detail::is_data_member_pointer<D>()
# elif BOOST_NO_FUNCTION_TEMPLATE_ORDERING
, 0
# endif
);
return this->def_readwrite_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER);
}
template <class D>
self& def_readonly(char const* name, D& d)
{
return this->def_readonly_impl(
name, d
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004)
, detail::is_data_member_pointer<D>()
# elif BOOST_NO_FUNCTION_TEMPLATE_ORDERING
, 0
# endif
);
return this->def_readonly_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER);
}
template <class D>
self& def_readwrite(char const* name, D& d)
{
return this->def_readwrite_impl(
name, d
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004)
, detail::is_data_member_pointer<D>()
# elif BOOST_NO_FUNCTION_TEMPLATE_ORDERING
, 0
# endif
);
return this->def_readwrite_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER);
}
// Property creation
@@ -444,13 +431,7 @@ class class_ : public objects::class_base
template <class D, class B>
self& def_readonly_impl(
char const* name, D B::*pm_
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004)
, mpl::true_
# elif BOOST_NO_FUNCTION_TEMPLATE_ORDERING
, int
# endif
)
char const* name, D B::*pm_ BOOST_PYTHON_YES_DATA_MEMBER)
{
D T::*pm = pm_;
return this->add_property(name, make_getter(pm));
@@ -458,13 +439,7 @@ class class_ : public objects::class_base
template <class D, class B>
self& def_readwrite_impl(
char const* name, D B::*pm_
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004)
, mpl::true_
# elif BOOST_NO_FUNCTION_TEMPLATE_ORDERING
, int
# endif
)
char const* name, D B::*pm_ BOOST_PYTHON_YES_DATA_MEMBER)
{
D T::*pm = pm_;
return this->add_property(name, make_getter(pm), make_setter(pm));
@@ -472,26 +447,14 @@ class class_ : public objects::class_base
template <class D>
self& def_readonly_impl(
char const* name, D& d
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004)
, mpl::false_
# elif BOOST_NO_FUNCTION_TEMPLATE_ORDERING
, ...
# endif
)
char const* name, D& d BOOST_PYTHON_NO_DATA_MEMBER)
{
return this->add_static_property(name, make_getter(d));
}
template <class D>
self& def_readwrite_impl(
char const* name, D& d
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004)
, mpl::false_
# elif BOOST_NO_FUNCTION_TEMPLATE_ORDERING
, ...
# endif
)
char const* name, D& d BOOST_PYTHON_NO_DATA_MEMBER)
{
return this->add_static_property(name, make_getter(d), make_setter(d));
}
@@ -677,4 +640,9 @@ namespace detail
}} // namespace boost::python
# undef BOOST_PYTHON_DATA_MEMBER_HELPER
# undef BOOST_PYTHON_YES_DATA_MEMBER
# undef BOOST_PYTHON_NO_DATA_MEMBER
# undef BOOST_PYTHON_NO_MEMBER_POINTER_ORDERING
#endif // CLASS_DWA200216_HPP

31
include/boost/python/data_members.hpp
View File

@@ -27,7 +27,6 @@
# include <boost/mpl/apply_if.hpp>
# include <boost/mpl/if.hpp>
# include <boost/mpl/identity.hpp>
# include <boost/bind.hpp>
@@ -220,24 +219,52 @@ inline object make_getter(D& d, Policies const& policies)
return detail::make_getter(d, policies, 0L);
}
template <class D, class Policies>
inline object make_getter(D const& d, Policies const& policies)
{
return detail::make_getter(d, policies, 0L);
}
template <class D>
inline object make_getter(D& x)
{
return detail::make_getter(x, detail::not_specified(), 0L);
}
# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
template <class D>
inline object make_getter(D const& x)
{
return detail::make_getter(x, detail::not_specified(), 0L);
}
# endif
template <class D, class Policies>
inline object make_setter(D& x, Policies const& policies)
{
return detail::make_setter(x, policies, 0L);
}
template <class D, class Policies>
inline object make_setter(D const& x, Policies const& policies)
{
return detail::make_setter(x, policies, 0L);
}
template <class D>
inline object make_setter(D& x)
{
return detail::make_setter(x, default_call_policies(), 0L);
}
# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
template <class D>
inline object make_setter(D const& x)
{
return detail::make_setter(x, default_call_policies(), 0L);
}
# endif
}} // namespace boost::python
#endif // DATA_MEMBERS_DWA2002328_HPP