aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-01-22 01:25:28 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-01-22 01:25:28 +0000
commit8ed98c406675c8ff01381633c4e41ade4c96360e (patch)
tree29c617d3002c68fc6cf9850e08470c2a47e27de2 /python
parent8c3decbad616902b8ffbf7d3a8cda8cbf8cbf8f8 (diff)
downloadpaludis-8ed98c406675c8ff01381633c4e41ade4c96360e.tar.gz
paludis-8ed98c406675c8ff01381633c4e41ade4c96360e.tar.xz
Sort keywords by name first, then by stable/testing/etc.
Diffstat (limited to 'python')
-rw-r--r--python/iterable.hh4
-rw-r--r--python/validated.hh26
2 files changed, 15 insertions, 15 deletions
diff --git a/python/iterable.hh b/python/iterable.hh
index ced4fe3..6a2dc53 100644
--- a/python/iterable.hh
+++ b/python/iterable.hh
@@ -38,8 +38,8 @@ namespace paludis
static const bool value = tr1::is_convertible<From_, To_>::value;
};
- template <typename From_, typename ValidatedDataType_, typename Validator_, bool full_comparison_>
- struct IsConvertible<From_, Validated<ValidatedDataType_, Validator_, full_comparison_> >
+ template <typename From_, typename ValidatedDataType_, typename Validator_, bool full_comparison_, typename Comparator_>
+ struct IsConvertible<From_, Validated<ValidatedDataType_, Validator_, full_comparison_, Comparator_> >
{
static const bool value = tr1::is_convertible<From_, ValidatedDataType_>::value;
};
diff --git a/python/validated.hh b/python/validated.hh
index 452a6b4..f4a02ba 100644
--- a/python/validated.hh
+++ b/python/validated.hh
@@ -32,45 +32,45 @@ namespace paludis
template <typename V_>
class class_validated;
- template <typename ValidatedDataType_, typename Validator_>
- class class_validated<Validated<ValidatedDataType_, Validator_, true> > :
- public boost::python::class_<Validated<ValidatedDataType_, Validator_, true> >
+ template <typename ValidatedDataType_, typename Validator_, typename Comparator_>
+ class class_validated<Validated<ValidatedDataType_, Validator_, true, Comparator_> > :
+ public boost::python::class_<Validated<ValidatedDataType_, Validator_, true, Comparator_> >
{
public:
class_validated(const std::string & name,
const std::string & class_doc, const std::string & init_arg="string") :
- boost::python::class_<Validated<ValidatedDataType_, Validator_, true> >(
+ boost::python::class_<Validated<ValidatedDataType_, Validator_, true, Comparator_> >(
name.c_str(), class_doc.c_str(),
boost::python::init<const ValidatedDataType_ &>(("__init__("+init_arg+")").c_str())
)
{
this->def(boost::python::self_ns::str(boost::python::self));
this->def("__cmp__",
- &paludis::python::py_cmp<Validated<ValidatedDataType_, Validator_, true> >);
+ &paludis::python::py_cmp<Validated<ValidatedDataType_, Validator_, true, Comparator_> >);
boost::python::implicitly_convertible<ValidatedDataType_,
- Validated<ValidatedDataType_, Validator_, true> >();
+ Validated<ValidatedDataType_, Validator_, true, Comparator_> >();
}
};
- template <typename ValidatedDataType_, typename Validator_>
- class class_validated<Validated<ValidatedDataType_, Validator_, false> > :
- public boost::python::class_<Validated<ValidatedDataType_, Validator_, false> >
+ template <typename ValidatedDataType_, typename Validator_, typename Comparator_>
+ class class_validated<Validated<ValidatedDataType_, Validator_, false, Comparator_> > :
+ public boost::python::class_<Validated<ValidatedDataType_, Validator_, false, Comparator_> >
{
public:
class_validated(const std::string & name,
const std::string & class_doc, const std::string & init_arg="string") :
- boost::python::class_<Validated<ValidatedDataType_, Validator_, false> >(
+ boost::python::class_<Validated<ValidatedDataType_, Validator_, false, Comparator_> >(
name.c_str(), class_doc.c_str(),
boost::python::init<const ValidatedDataType_ &>(("__init__("+init_arg+")").c_str())
)
{
this->def(boost::python::self_ns::str(boost::python::self));
this->def("__eq__",
- &paludis::python::py_eq<Validated<ValidatedDataType_, Validator_, false> >);
+ &paludis::python::py_eq<Validated<ValidatedDataType_, Validator_, false, Comparator_> >);
this->def("__ne__",
- &paludis::python::py_ne<Validated<ValidatedDataType_, Validator_, false> >);
+ &paludis::python::py_ne<Validated<ValidatedDataType_, Validator_, false, Comparator_> >);
boost::python::implicitly_convertible<ValidatedDataType_,
- Validated<ValidatedDataType_, Validator_, false> >();
+ Validated<ValidatedDataType_, Validator_, false, Comparator_> >();
}
};