Skip to content

Commit

Permalink
fix issues with missing construtors that strangely does not break loc…
Browse files Browse the repository at this point in the history
…ally even though it really should. ref EOSIO#175
  • Loading branch information
wanderingbort committed Sep 8, 2017
1 parent 695b59d commit 8902099
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion libraries/chain/chain_controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
5 changes: 3 additions & 2 deletions libraries/chain/include/eos/chain/transaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<MessageOutput> output;
Expand Down

0 comments on commit 8902099

Please sign in to comment.