Subject: [Boost-commit] svn:boost r69538 - in trunk: boost/icl boost/icl/concept boost/icl/type_traits libs/icl/test
From: afojgo_at_[hidden]
Date: 2011-03-03 17:38:31
Author: jofaber
Date: 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
New Revision: 69538
URL: http://svn.boost.org/trac/boost/changeset/69538
Log:
Fixed std::tr1/boost ambiguities. Updated documentation for function 'find'.
Text files modified:
trunk/boost/icl/concept/interval_associator.hpp | 14 ++------------
trunk/boost/icl/concept/interval_map.hpp | 7 ++++---
trunk/boost/icl/interval_base_set.hpp | 1 -
trunk/boost/icl/rational.hpp | 2 +-
trunk/boost/icl/type_traits/has_inverse.hpp | 2 +-
trunk/boost/icl/type_traits/is_combinable.hpp | 10 +++++-----
trunk/boost/icl/type_traits/is_container.hpp | 4 ++--
trunk/boost/icl/type_traits/is_key_container_of.hpp | 4 ++--
trunk/libs/icl/test/test_interval_map_shared.hpp | 14 ++------------
trunk/libs/icl/test/test_value_maker.hpp | 15 ---------------
10 files changed, 19 insertions(+), 54 deletions(-)
Modified: trunk/boost/icl/concept/interval_associator.hpp
==============================================================================
--- trunk/boost/icl/concept/interval_associator.hpp (original)
+++ trunk/boost/icl/concept/interval_associator.hpp 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
@@ -649,7 +649,7 @@
//------------------------------------------------------------------------------
template<class Type, class CoType>
typename enable_if<mpl::and_< is_interval_container<Type>
- , is_same<CoType, typename domain_type_of<Type>::type> >,
+ , boost::is_same<CoType, typename domain_type_of<Type>::type> >,
bool>::type
intersects(const Type& left, const CoType& right)
{
@@ -658,7 +658,7 @@
template<class Type, class CoType>
typename enable_if<mpl::and_< is_interval_container<Type>
- , is_same<CoType, typename interval_type_of<Type>::type> >,
+ , boost::is_same<CoType, typename interval_type_of<Type>::type> >,
bool>::type
intersects(const Type& left, const CoType& right)
{
@@ -724,16 +724,6 @@
return false;
}
-//CL?
-//template<class Type, class AssociateT>
-//typename enable_if<mpl::and_< is_interval_map<Type>
-// , is_inter_derivative<Type, AssociateT> >,
-// bool>::type
-//intersects(const Type& left, const AssociateT& right)
-//{
-// return icl::intersects(left, right);
-//}
-
/** \b Returns true, if \c left and \c right have no common elements.
Intervals are interpreted as sequence of elements.
\b Complexity: loglinear, if \c left and \c right are interval containers. */
Modified: trunk/boost/icl/concept/interval_map.hpp
==============================================================================
--- trunk/boost/icl/concept/interval_map.hpp (original)
+++ trunk/boost/icl/concept/interval_map.hpp 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
@@ -429,7 +429,8 @@
template<class Type, class OperandT>
typename enable_if<mpl::and_< is_interval_map<Type>
, is_total<Type>
- , is_same<OperandT, typename segment_type_of<Type>::type> >,
+ , boost::is_same< OperandT
+ , typename segment_type_of<Type>::type> >,
bool>::type
intersects(const Type&, const OperandT&)
{
@@ -439,7 +440,7 @@
template<class Type, class OperandT>
typename enable_if<mpl::and_< is_interval_map<Type>
, mpl::not_<is_total<Type> >
- , is_same<OperandT, typename segment_type_of<Type>::type> >,
+ , boost::is_same<OperandT, typename segment_type_of<Type>::type> >,
bool>::type
intersects(const Type& object, const OperandT& operand)
{
@@ -450,7 +451,7 @@
template<class Type, class OperandT>
typename enable_if<mpl::and_< is_interval_map<Type>
- , is_same<OperandT, typename element_type_of<Type>::type> >,
+ , boost::is_same<OperandT, typename element_type_of<Type>::type> >,
bool>::type
intersects(const Type& object, const OperandT& operand)
{
Modified: trunk/boost/icl/interval_base_set.hpp
==============================================================================
--- trunk/boost/icl/interval_base_set.hpp (original)
+++ trunk/boost/icl/interval_base_set.hpp 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
@@ -205,7 +205,6 @@
const_iterator find(const element_type& key_value)const
{
return icl::find(*this, key_value);
- //CL return this->_set.find(icl::singleton<segment_type>(key));
}
/** Find the first interval, that collides with interval \c key_interval */
Modified: trunk/boost/icl/rational.hpp
==============================================================================
--- trunk/boost/icl/rational.hpp (original)
+++ trunk/boost/icl/rational.hpp 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
@@ -59,7 +59,7 @@
struct has_inverse<boost::rational<Integral> >
{
typedef has_inverse type;
- BOOST_STATIC_CONSTANT(bool, value = (is_signed<Integral>::value));
+ BOOST_STATIC_CONSTANT(bool, value = (boost::is_signed<Integral>::value));
};
}} // namespace icl boost
Modified: trunk/boost/icl/type_traits/has_inverse.hpp
==============================================================================
--- trunk/boost/icl/type_traits/has_inverse.hpp (original)
+++ trunk/boost/icl/type_traits/has_inverse.hpp 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
@@ -18,7 +18,7 @@
{
typedef has_inverse<Type> type;
BOOST_STATIC_CONSTANT(bool,
- value = (type_traits::ice_or<is_signed<Type>::value,
+ value = (type_traits::ice_or<boost::is_signed<Type>::value,
is_floating_point<Type>::value>::value));
};
Modified: trunk/boost/icl/type_traits/is_combinable.hpp
==============================================================================
--- trunk/boost/icl/type_traits/is_combinable.hpp (original)
+++ trunk/boost/icl/type_traits/is_combinable.hpp 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
@@ -25,7 +25,7 @@
{
typedef is_overloadable<Type> type;
BOOST_STATIC_CONSTANT(bool, value =
- (is_same<Type, typename Type::overloadable_type>::value)
+ (boost::is_same<Type, typename Type::overloadable_type>::value)
);
};
@@ -36,8 +36,8 @@
{
typedef is_codomain_equal<LeftT, RightT> type;
BOOST_STATIC_CONSTANT(bool, value =
- (is_same<typename LeftT::codomain_type,
- typename RightT::codomain_type>::value)
+ (boost::is_same<typename LeftT::codomain_type,
+ typename RightT::codomain_type>::value)
);
};
@@ -47,8 +47,8 @@
{
typedef is_key_compare_equal<LeftT, RightT> type;
BOOST_STATIC_CONSTANT(bool, value =
- (is_same<typename LeftT::key_compare,
- typename RightT::key_compare>::value)
+ (boost::is_same<typename LeftT::key_compare,
+ typename RightT::key_compare>::value)
);
};
Modified: trunk/boost/icl/type_traits/is_container.hpp
==============================================================================
--- trunk/boost/icl/type_traits/is_container.hpp (original)
+++ trunk/boost/icl/type_traits/is_container.hpp 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
@@ -42,8 +42,8 @@
BOOST_STATIC_CONSTANT(bool,
value = (mpl::and_< is_container<Type>
, detail::has_key_type<Type>
- , is_same< typename key_type_of<Type>::type
- , typename value_type_of<Type>::type >
+ , boost::is_same< typename key_type_of<Type>::type
+ , typename value_type_of<Type>::type >
, mpl::not_<detail::has_segment_type<Type> >
>::value )
);
Modified: trunk/boost/icl/type_traits/is_key_container_of.hpp
==============================================================================
--- trunk/boost/icl/type_traits/is_key_container_of.hpp (original)
+++ trunk/boost/icl/type_traits/is_key_container_of.hpp 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
@@ -64,7 +64,7 @@
typedef is_strict_key_container_of<KeyT, ObjectT> type;
BOOST_STATIC_CONSTANT(bool, value =
(mpl::and_< is_map<ObjectT>
- , is_same<KeyT, typename key_container_type_of<ObjectT>::type> >::value)
+ , boost::is_same<KeyT, typename key_container_type_of<ObjectT>::type> >::value)
);
};
@@ -75,7 +75,7 @@
BOOST_STATIC_CONSTANT(bool, value =
(mpl::or_< is_strict_key_container_of<KeyT, ObjectT>
, mpl::and_< mpl::or_<is_set<ObjectT>, is_map<ObjectT> >
- , is_same<ObjectT, KeyT> > >::value)
+ , boost::is_same<ObjectT, KeyT> > >::value)
);
};
Modified: trunk/libs/icl/test/test_interval_map_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_interval_map_shared.hpp (original)
+++ trunk/libs/icl/test/test_interval_map_shared.hpp 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
@@ -220,16 +220,6 @@
BOOST_CHECK_EQUAL( hull(_I4_4I_u2).upper(), v4 );
}
- if(is_discrete<T>::value)
- {
- if(is_same<float, T>::value)
- {
- BOOST_CHECK( false );
- }
- //BOOST_CHECK_EQUAL( icl::first(hull(_I4_4I_u2)), v4 );
- //BOOST_CHECK_EQUAL( icl::last(hull(_I4_4I_u2)), v4 );
- }
-
IntervalMapT _I4_4I_u2_copy(_I4_4I_u2);
IntervalMapT _I4_4I_u2_assigned;
_I4_4I_u2_assigned = _I4_4I_u2;
@@ -1221,7 +1211,7 @@
BOOST_CHECK_EQUAL( found1->second, found2->second );
BOOST_CHECK_EQUAL( found1->second, MK_u(2) );
- if( mpl::or_<mpl::not_<is_static_left_open<IntervalT> >, is_signed<T> >::value )
+ if( mpl::or_<mpl::not_<is_static_left_open<IntervalT> >, boost::is_signed<T> >::value )
{
found1 = map_a.find(MK_v(0));
found2 = icl::find(map_a, MK_v(0));
@@ -1234,7 +1224,7 @@
BOOST_CHECK ( found1 == found2 );
BOOST_CHECK ( found1 == map_a.end() );
- if( mpl::or_<mpl::not_<is_static_left_open<IntervalT> >, is_signed<T> >::value )
+ if( mpl::or_<mpl::not_<is_static_left_open<IntervalT> >, boost::is_signed<T> >::value )
{
BOOST_CHECK( !icl::contains(map_a, MK_v(0)) );
}
Modified: trunk/libs/icl/test/test_value_maker.hpp
==============================================================================
--- trunk/libs/icl/test/test_value_maker.hpp (original)
+++ trunk/libs/icl/test/test_value_maker.hpp 2011-03-03 17:38:25 EST (Thu, 03 Mar 2011)
@@ -138,21 +138,6 @@
return segment_type(inter_val, test_value<codomain_type>::make(val));
}
- /*CL?
- static interval_type interval_(int lower, int upper, int bounds = 2)
- {
- return interval_type(test_value<domain_type>::make(lower),
- test_value<domain_type>::make(upper),
- interval_bounds(static_cast<bound_type>(bounds)));
- }
-
- static segment_type val_pair(int lower, int upper, int val, int bounds = 2)
- {
- return segment_type( interval_(lower, upper, static_cast<bound_type>(bounds)),
- test_value<codomain_type>::make(val) );
- }
- */
-
static domain_mapping_type map_pair(int key, int val)
{
return domain_mapping_type(test_value< domain_type>::make(key),