From 86fb00648019cbd87fa9c07694c4c1b623010a3f Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Thu, 1 Nov 2018 19:06:11 -0600 Subject: [PATCH 1/3] Fix warning Potential optimization: don't move a temporary as this prevents copy elision --- libraries/app/database_api.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index acb90c8af5..6e05f5fd0d 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -2448,7 +2448,7 @@ void database_api_impl::on_applied_block() } if( market.valid() && _market_subscriptions.count(*market) ) // FIXME this may cause fill_order_operation be pushed before order creation - subscribed_markets_ops[*market].emplace_back( std::move( std::make_pair( op.op, op.result ) ) ); + subscribed_markets_ops[*market].emplace_back(std::make_pair(op.op, op.result)); } /// we need to ensure the database_api is not deleted for the life of the async operation auto capture_this = shared_from_this(); From 3d24032ade2c3e72250877669eb0158c89027fa9 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Fri, 26 Oct 2018 17:13:08 -0500 Subject: [PATCH 2/3] Fix build errors - Add missing FC_REFLECT_TYPENAME on account operation extentions - Replace deprecated call to fc::rand_pseudo_bytes with fc::rand_bytes. --- libraries/chain/include/graphene/chain/protocol/account.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/chain/include/graphene/chain/protocol/account.hpp b/libraries/chain/include/graphene/chain/protocol/account.hpp index f6178d3e24..f2be53837b 100644 --- a/libraries/chain/include/graphene/chain/protocol/account.hpp +++ b/libraries/chain/include/graphene/chain/protocol/account.hpp @@ -274,6 +274,7 @@ FC_REFLECT_ENUM( graphene::chain::account_whitelist_operation::account_listing, (no_listing)(white_listed)(black_listed)(white_and_black_listed)) FC_REFLECT(graphene::chain::account_create_operation::ext, (null_ext)(owner_special_authority)(active_special_authority)(buyback_options) ) +FC_REFLECT_TYPENAME(graphene::chain::extension) FC_REFLECT( graphene::chain::account_create_operation, (fee)(registrar) (referrer)(referrer_percent) @@ -281,6 +282,7 @@ FC_REFLECT( graphene::chain::account_create_operation, ) FC_REFLECT(graphene::chain::account_update_operation::ext, (null_ext)(owner_special_authority)(active_special_authority) ) +FC_REFLECT_TYPENAME(graphene::chain::extension) FC_REFLECT( graphene::chain::account_update_operation, (fee)(account)(owner)(active)(new_options)(extensions) ) From 9952121981381d5bc62abd87192b94d01d61a708 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 7 Nov 2018 12:09:01 -0600 Subject: [PATCH 3/3] Include smart_ref_impl from fork_database.cpp Required for build on some configurations --- libraries/chain/fork_database.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index 39e9d3b83f..b94a2cdc29 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -24,6 +24,8 @@ #include #include +#include + namespace graphene { namespace chain { fork_database::fork_database() {