Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fix whitespace

Browse source
This commit is contained in:
Nathan Hourt 2015-08-17 11:44:11 -04:00
parent 2212cfe95b
commit 2244e467ed
3 changed files with 51 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/chain/fork_database.cpp
View file

@ -106,19 +106,23 @@ pair<fork_database::branch_type,fork_database::branch_type>
while( first_branch->data.block_num() > second_branch->data.block_num() ) while( first_branch->data.block_num() > second_branch->data.block_num() )
{ {
result.first.push_back(first_branch); result.first.push_back(first_branch);
first_branch = first_branch->prev.lock(); FC_ASSERT( first_branch ); first_branch = first_branch->prev.lock();
FC_ASSERT(first_branch);
} }
while( second_branch->data.block_num() > first_branch->data.block_num() ) while( second_branch->data.block_num() > first_branch->data.block_num() )
{ {
result.second.push_back( second_branch ); result.second.push_back( second_branch );
second_branch = second_branch->prev.lock(); FC_ASSERT( second_branch ); second_branch = second_branch->prev.lock();
FC_ASSERT(second_branch);
} }
while( first_branch->data.previous != second_branch->data.previous ) while( first_branch->data.previous != second_branch->data.previous )
{ {
result.first.push_back(first_branch); result.first.push_back(first_branch);
result.second.push_back(second_branch); result.second.push_back(second_branch);
first_branch = first_branch->prev.lock(); FC_ASSERT( first_branch ); first_branch = first_branch->prev.lock();
second_branch = second_branch->prev.lock(); FC_ASSERT( second_branch ); FC_ASSERT(first_branch);
second_branch = second_branch->prev.lock();
FC_ASSERT(second_branch);
} }
if( first_branch && second_branch ) if( first_branch && second_branch )
{ {
@ -127,6 +131,7 @@ pair<fork_database::branch_type,fork_database::branch_type>
} }
return result; return result;
} FC_CAPTURE_AND_RETHROW( (first)(second) ) } } FC_CAPTURE_AND_RETHROW( (first)(second) ) }
void fork_database::set_head(shared_ptr<fork_item> h) void fork_database::set_head(shared_ptr<fork_item> h)
{ {
_head = h; _head = h;

1
libraries/chain/include/graphene/chain/fork_database.hpp
View file

@ -72,7 +72,6 @@ namespace graphene { namespace chain {
shared_ptr<fork_item> head()const { return _head; } shared_ptr<fork_item> head()const { return _head; }
void pop_block(); void pop_block();
/** /**
* Given two head blocks, return two branches of the fork graph that * Given two head blocks, return two branches of the fork graph that
* end with a common ancestor (same prior block) * end with a common ancestor (same prior block)