From 243a269f368ece396f028919b9df9ae4de345c38 Mon Sep 17 00:00:00 2001 From: Srdjan Obucina Date: Thu, 12 Dec 2019 19:35:27 +0100 Subject: [PATCH] Fix build errors due to merge conflict --- libraries/app/impacted.cpp | 1 + libraries/chain/db_notify.cpp | 1 + libraries/chain/include/graphene/chain/protocol/operations.hpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/app/impacted.cpp b/libraries/app/impacted.cpp index 62e3700b..5b6f5411 100644 --- a/libraries/app/impacted.cpp +++ b/libraries/app/impacted.cpp @@ -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 ); } diff --git a/libraries/chain/db_notify.cpp b/libraries/chain/db_notify.cpp index d6ed0e55..83a58c45 100644 --- a/libraries/chain/db_notify.cpp +++ b/libraries/chain/db_notify.cpp @@ -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 ); } diff --git a/libraries/chain/include/graphene/chain/protocol/operations.hpp b/libraries/chain/include/graphene/chain/protocol/operations.hpp index c54dedff..e1cc5225 100644 --- a/libraries/chain/include/graphene/chain/protocol/operations.hpp +++ b/libraries/chain/include/graphene/chain/protocol/operations.hpp @@ -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