Added support for node and value pointers non-convertible from raw references

This commit is contained in:
Ion Gaztañaga committed 2014-06-12 11:49:42 +02:00
1 parent 4390889bf0
commit 563eca32de
48 files changed
+1203 -1267

No files matched your search

+12 -27
View File
@@ -70,21 +70,6 @@ template < typename List_Type, typename Value_Container >
void test_slist< List_Type, Value_Container >
::test_all (Value_Container& values)
{
#ifdef PRINT_TESTS
std::clog << "testing slist with:\n"
<< " value_type = " << typeid(value_type).name() << "\n"
<< " sizeof(value_type) = " << sizeof(value_type) << "\n"
<< " link_mode = " << value_traits::link_mode << "\n"
<< " node = " << typeid(typename list_type::node).name() << "\n"
<< " sizeof(node) = " << sizeof(typename list_type::node) << "\n"
<< " node_ptr = " << typeid(typename list_type::node_ptr).name() << "\n"
<< " sizeof(node_ptr) = " << sizeof(typename list_type::node_ptr) << "\n"
<< " constant_time_size = " << list_type::constant_time_size << "\n"
<< " linear = " << list_type::linear << "\n"
<< " cache_last = " << list_type::cache_last << "\n"
<< " has_container_from_iterator = " << list_type::has_container_from_iterator << "\n"
<< " sizeof(list_type) = " << sizeof(list_type) << "\n";
#endif
{
list_type list(values.begin(), values.end());
test::test_container(list);
@@ -102,7 +87,7 @@ void test_slist< List_Type, Value_Container >
test_slow_insert (values);
test_swap(values);
test_clone(values);
test_container_from_end(values, detail::bool_< not list_type::linear and list_type::has_container_from_iterator >());
test_container_from_end(values, detail::bool_< !list_type::linear && list_type::has_container_from_iterator >());
}
//test: push_front, pop_front, front, size, empty:
@@ -442,12 +427,12 @@ void test_slist< List_Type, Value_Container >
BOOST_TEST (testlist1 == list_type::container_from_end_iterator(testlist1.cend()));
}
template < typename Value_Traits, bool Constant_Time_Size, bool Linear, bool CacheLast, bool Default_Holder, typename Value_Container >
template < typename Value_Traits, bool ConstantTimeSize, bool Linear, bool CacheLast, bool Default_Holder, typename Value_Container >
struct make_and_test_slist
: test_slist< slist< typename Value_Traits::value_type,
value_traits< Value_Traits >,
size_type< std::size_t >,
constant_time_size< Constant_Time_Size >,
constant_time_size< ConstantTimeSize >,
linear<Linear>,
cache_last<CacheLast>
>,
@@ -455,12 +440,12 @@ struct make_and_test_slist
>
{};
template < typename Value_Traits, bool Constant_Time_Size, bool Linear, bool CacheLast, typename Value_Container >
struct make_and_test_slist< Value_Traits, Constant_Time_Size, Linear, CacheLast, false, Value_Container >
template < typename Value_Traits, bool ConstantTimeSize, bool Linear, bool CacheLast, typename Value_Container >
struct make_and_test_slist< Value_Traits, ConstantTimeSize, Linear, CacheLast, false, Value_Container >
: test_slist< slist< typename Value_Traits::value_type,
value_traits< Value_Traits >,
size_type< std::size_t >,
constant_time_size< Constant_Time_Size >,
constant_time_size< ConstantTimeSize >,
linear<Linear>,
cache_last<CacheLast>,
header_holder_type< pointer_holder< typename Value_Traits::node_traits::node > >
@@ -735,7 +720,7 @@ class test_main_template<VoidPointer, false, Default_Holder>
}
};
template < bool Constant_Time_Size >
template < bool ConstantTimeSize >
struct test_main_template_bptr
{
int operator()()
@@ -743,13 +728,13 @@ struct test_main_template_bptr
typedef BPtr_Value value_type;
typedef BPtr_Value_Traits< List_BPtr_Node_Traits > list_value_traits;
typedef typename list_value_traits::node_ptr node_ptr;
typedef Bounded_Allocator< value_type > allocator_type;
typedef bounded_allocator< value_type > allocator_type;
allocator_type::init();
allocator_type allocator;
{
Bounded_Reference_Cont< value_type > ref_cont;
bounded_reference_cont< value_type > ref_cont;
for (int i = 0; i < 5; ++i)
{
node_ptr tmp = allocator.allocate(1);
@@ -760,10 +745,10 @@ struct test_main_template_bptr
test_slist < slist < value_type,
value_traits< list_value_traits >,
size_type< std::size_t >,
constant_time_size< Constant_Time_Size >,
header_holder_type< Bounded_Pointer_Holder< value_type > >
constant_time_size< ConstantTimeSize >,
header_holder_type< bounded_pointer_holder< value_type > >
>,
Bounded_Reference_Cont< value_type >
bounded_reference_cont< value_type >
>::test_all(ref_cont);
}