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

Fix build errors due to merge conflict

Browse source
This commit is contained in:
Srdjan Obucina 2019-12-12 19:35:27 +01:00
parent 6efbf6c512
commit 243a269f36
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/app/impacted.cpp
View file

@ -309,6 +309,7 @@ struct get_impacted_account_visitor
}
void operator()( const son_heartbeat_operation& op ){
_impacted.insert( op.owner_account );
}
void operator()( const sidechain_address_add_operation& op ){
_impacted.insert( op.sidechain_address_account );
}

1
libraries/chain/db_notify.cpp
View file

@ -296,6 +296,7 @@ struct get_impacted_account_visitor
}
void operator()( const son_heartbeat_operation& op ) {
_impacted.insert( op.owner_account );
}
void operator()( const sidechain_address_add_operation& op ) {
_impacted.insert( op.sidechain_address_account );
}

2
libraries/chain/include/graphene/chain/protocol/operations.hpp
View file

@ -141,7 +141,7 @@ namespace graphene { namespace chain {
son_create_operation,
son_update_operation,
son_delete_operation,
son_heartbeat_operation
son_heartbeat_operation,
sidechain_address_add_operation,
sidechain_address_update_operation,
sidechain_address_delete_operation