coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-28 21:38:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development'

Browse Source
This commit is contained in:
John Wellbelove 2015-10-10 16:56:40 +01:00
commit f507f2fa53
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
iforward_list.h
View File

@ -399,7 +399,7 @@ namespace etl
if (!full())
{
Data_Node& data_node = allocate_data_node(*first++);
join(*p_last_node, data_node);
join(p_last_node, &data_node);
data_node.next = nullptr;
p_last_node = &data_node;
++current_size;
@ -432,7 +432,7 @@ namespace etl
if (!full())
{
Data_Node& data_node = allocate_data_node(value);
join(*p_last_node, data_node);
join(p_last_node, &data_node);
data_node.next = nullptr;
p_last_node = &data_node;
++current_size;
@ -458,7 +458,7 @@ namespace etl
if (!full())
{
Data_Node& data_node = allocate_data_node(T());
insert_node(start_node, data_node);
insert_node_after(start_node, data_node);
}
else
#ifdef ETL_THROW_EXCEPTIONS
@ -586,7 +586,7 @@ namespace etl
p_current->next = p_last;
}
join(start_node, *p_current);
join(&start_node, p_current);
}
//*************************************************************************
@ -693,7 +693,7 @@ namespace etl
Node* p_next = p_first->next;
// Join the ends.
join(*p_first, *p_last);
join(p_first, p_last);
p_first = p_next;
@ -857,13 +857,13 @@ namespace etl
// Add the next node to the merged head.
if (p_head == before_begin())
{
join(*p_head.p_node, *p_node.p_node);
join(p_head.p_node, p_node.p_node);
p_head = p_node;
p_tail = p_node;
}
else
{
join(*p_tail.p_node, *p_node.p_node);
join(p_tail.p_node, p_node.p_node);
p_tail = p_node;
}
@ -984,17 +984,17 @@ namespace etl
//*************************************************************************
/// Join two nodes.
//*************************************************************************
void join(Node& left, Node& right)
void join(Node* left, Node* right)
{
left.next = &static_cast<Data_Node&>(right);
left->next = static_cast<Data_Node*>(right);
}
//*************************************************************************
/// Join two nodes.
//*************************************************************************
void join(Data_Node& left, Data_Node& right)
void join(Data_Node* left, Data_Node* right)
{
left.next = &right;
left->next = right;
}
//*************************************************************************
@ -1011,7 +1011,9 @@ namespace etl
void insert_node_after(Node& position, Node& node)
{
// Connect to the forward_list.
join(position, node);
node.next = position.next;
join(&position, &node);
// One more.
++current_size;
@ -1025,14 +1027,17 @@ namespace etl
// The node to erase.
Node* p_node = node.next;
// Disconnect the node from the forward_list.
join(node, *p_node->next);
if (p_node != nullptr)
{
// Disconnect the node from the forward_list.
join(&node, p_node->next);
// Destroy the pool object.
destroy_data_node(static_cast<Data_Node&>(*p_node));
// Destroy the pool object.
destroy_data_node(static_cast<Data_Node&>(*p_node));
// One less.
--current_size;
// One less.
--current_size;
}
}
//*************************************************************************

3
test/test_forward_list.cpp
View File

@ -326,6 +326,9 @@ namespace
CHECK_NO_THROW(data.push_front(ItemNDC("5")));
CHECK_NO_THROW(data.push_front(ItemNDC("6")));
CHECK_EQUAL(6, data.size());
CHECK_EQUAL(6, std::distance(data.begin(), data.end()));
are_equal = std::equal(data.begin(), data.end(), compare_data.begin());
CHECK(are_equal);