Subject: [Boost-commit] svn:boost r60662 - sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op
From: erwann.rogard_at_[hidden]
Date: 2010-03-16 19:44:41
Author: e_r
Date: 2010-03-16 19:44:40 EDT (Tue, 16 Mar 2010)
New Revision: 60662
URL: http://svn.boost.org/trac/boost/changeset/60662
Log:
m
Text files modified:
sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/completed_policy.hpp | 6 +++---
sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/crtp.hpp | 38 +++++++++++++++++++-------------------
sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/range.hpp | 14 +++++++-------
3 files changed, 29 insertions(+), 29 deletions(-)
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/completed_policy.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/completed_policy.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/completed_policy.hpp 2010-03-16 19:44:40 EDT (Tue, 16 Mar 2010)
@@ -29,17 +29,17 @@
return !(P::equal(l,r));
}
template<typename L,typename R>
- static bool less_or_equal(const L& l,const R& r){
+ static bool less_equal(const L& l,const R& r){
return (P::less(l,r)) || (P::equal(l,r));
}
template<typename L,typename R>
static bool greater(const L& l,const R& r){
- return !(less_or_equal(l,r));
+ return !(less_equal(l,r));
}
template<typename L,typename R>
- static bool greater_or_equal(const L& l,const R& r){
+ static bool greater_equal(const L& l,const R& r){
return !(P::less(l,r));
}
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/crtp.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/crtp.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/crtp.hpp 2010-03-16 19:44:40 EDT (Tue, 16 Mar 2010)
@@ -25,15 +25,15 @@
// Source:
// http://groups.google.com/group/comp.lang.c++.moderated/browse_thread/thread/389d8fe278ef0b13#
- // If D inherits from crtp<D,P>, its comparison operators will forward to
- // P::equal(l,r)
- // P::less(l,r)
- // P::greater(l,r)
- // P::not_equal(l,r)
- // P::less_equal(l,r)
- // P::greater_equal(l,r)
- // where l and r are two objects of types L and R, such that either L or R,
- // or both, derive from crtp<>.
+ // Let G(P)={ D : D derives from crtp<D,P> }
+ // For either of (L xor R) in G(P) or (L and R) in G(P),
+ // Expression Returns
+ // operator == (const L&,const R&) P::equal(l,r)
+ // operator != (const L&,const R&) P::not_equal(l,r)
+ // operator < (const L&,const R&) P::less(l,r)
+ // operator > (const L&,const R&) P::greater(l,r)
+ // operator <= (const L&,const R&) P::less_equal(l,r)
+ // operator >= (const L&,const R&) P::greater_equal(l,r)
template<typename D,typename P>
struct crtp{
crtp(){}
@@ -79,7 +79,7 @@
>{};
template<typename T>
- struct is_base_of : boost::mpl::eval_if< // left-to-right evaluation
+ struct is_base_of : boost::mpl::eval_if<
traits::has_traits<T>,
traits::is_base_of_impl<T>,
boost::mpl::identity< boost::mpl::bool_<false> >
@@ -128,17 +128,17 @@
}
};
- struct less_or_equal_to{
+ struct less_equal{
template<typename P,typename L,typename R>
static bool call(const L& l,const R& r){
- return (P::less_or_equal_to(l,r));
+ return (P::less_equal(l,r));
}
};
- struct greater_or_equal_to{
+ struct greater_equal{
template<typename P,typename L,typename R>
static bool call(const L& l,const R& r){
- return (P::greater_or_equal_to(l,r));
+ return (P::greater_equal(l,r));
}
};
@@ -186,11 +186,11 @@
/**/
BOOST_ASSIGN_DETAIL_COMPARISON_OP( == , comparison_op::forward::equal )
-//BOOST_ASSIGN_DETAIL_COMPARISON_OP( != , comparison_op::forward::not_equal )
-//BOOST_ASSIGN_DETAIL_COMPARISON_OP( < , comparison_op::forward::less )
-//BOOST_ASSIGN_DETAIL_COMPARISON_OP( > , comparison_op::forward::greater )
-//BOOST_ASSIGN_DETAIL_COMPARISON_OP( <= , comparison_op::forward::less_or_equal )
-//BOOST_ASSIGN_DETAIL_COMPARISON_OP( >= , comparison_op::forward::greater_or_equal )
+BOOST_ASSIGN_DETAIL_COMPARISON_OP( != , comparison_op::forward::not_equal )
+BOOST_ASSIGN_DETAIL_COMPARISON_OP( < , comparison_op::forward::less )
+BOOST_ASSIGN_DETAIL_COMPARISON_OP( > , comparison_op::forward::greater )
+BOOST_ASSIGN_DETAIL_COMPARISON_OP( <= , comparison_op::forward::less_equal )
+//BOOST_ASSIGN_DETAIL_COMPARISON_OP( >= , comparison_op::forward::greater_equal )
}// comparison_op
}// detail
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/range.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/range.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/range.hpp 2010-03-16 19:44:40 EDT (Tue, 16 Mar 2010)
@@ -18,13 +18,13 @@
namespace detail{
namespace range_comparison_op{
- // Let D1, D2 and R model Range, and for D in {D1,D2}, D derives from
- // base_of<D>::type
- // then defines for Op in {==,!=,<,>,<=,>=},
- // Op(D1&,D2&)
- // Op(D1&,R&)
- // Op(R, D2&)
- // etc.
+ // Let G={ D : D derives from base_of<D>::type }
+ // Let L and R model Range. For either of (L xor R) in G or (L and R) in G,
+ // Expression Returns
+ // l == r ::boost::iterator_range_detail::equal( l, r )
+ // l < r ::boost::iterator_range_detail::less_than( l, r );
+ // The remaining operators, !=, >,<=,>= are defined using their
+ // relationships to the two fundamental ones.
struct fundamental_policy{
template<typename L,typename R>