From 89020991383620154e486f0d0ea48d6ef50bd423 Mon Sep 17 00:00:00 2001 From: Bart Wyatt Date: Fri, 8 Sep 2017 14:56:49 -0400 Subject: [PATCH] fix issues with missing construtors that strangely does not break locally even though it really should. ref EOSIO/eos#175 --- libraries/chain/chain_controller.cpp | 3 ++- libraries/chain/include/eos/chain/transaction.hpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/chain/chain_controller.cpp b/libraries/chain/chain_controller.cpp index 7cb528d17..36bfe571f 100644 --- a/libraries/chain/chain_controller.cpp +++ b/libraries/chain/chain_controller.cpp @@ -990,7 +990,8 @@ typename T::Processed chain_controller::process_transaction( const T& trx, int d auto& output = ptrx.output[i]; process_message(trx, trx.messages[i].code, trx.messages[i], output); if (output.inline_transaction.valid() ) { - output.inline_transaction = process_transaction(PendingInlineTransaction(*output.inline_transaction), depth + 1, start_time); + const Transaction& trx = *output.inline_transaction; + output.inline_transaction = process_transaction(PendingInlineTransaction(trx), depth + 1, start_time); } } diff --git a/libraries/chain/include/eos/chain/transaction.hpp b/libraries/chain/include/eos/chain/transaction.hpp index d57f4e3fc..347ab888b 100644 --- a/libraries/chain/include/eos/chain/transaction.hpp +++ b/libraries/chain/include/eos/chain/transaction.hpp @@ -167,14 +167,15 @@ namespace eos { namespace chain { struct PendingInlineTransaction : public types::Transaction { typedef types::Transaction super; - using super::super; + using super::super; typedef InlineTransaction Processed; }; struct MessageOutput; struct InlineTransaction : public types::Transaction { - explicit InlineTransaction( const PendingInlineTransaction& t ):Transaction(t){} + explicit InlineTransaction( const types::Transaction& t ):types::Transaction((const types::Transaction& )t){} + explicit InlineTransaction( const PendingInlineTransaction& t ):types::Transaction((const types::Transaction& )t){} InlineTransaction(){} vector output; -- GitLab