diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 8832ac9d..a80c4726 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -192,8 +192,8 @@ namespace graphene { namespace app { { _app.chain_database()->check_tansaction_for_duplicated_operations(trx); - fc::promise::ptr prom( new fc::promise() ); - broadcast_transaction_with_callback( [=]( const fc::variant& v ){ + fc::promise::ptr prom = fc::promise::create(); + broadcast_transaction_with_callback( [prom]( const fc::variant& v ){ prom->set_value(v); }, trx ); diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 9923fa8f..c15b0e08 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -948,7 +948,7 @@ namespace graphene { namespace net { namespace detail { #if 0 try { - _retrigger_connect_loop_promise = fc::promise::ptr( new fc::promise("graphene::net::retrigger_connect_loop") ); + _retrigger_connect_loop_promise = fc::promise::create("graphene::net::retrigger_connect_loop"); if( is_wanting_new_connections() || !_add_once_node_list.empty() ) { if( is_wanting_new_connections() ) @@ -1078,7 +1078,7 @@ namespace graphene { namespace net { namespace detail { if( !_sync_items_to_fetch_updated ) { dlog( "no sync items to fetch right now, going to sleep" ); - _retrigger_fetch_sync_items_loop_promise = fc::promise::ptr( new fc::promise("graphene::net::retrigger_fetch_sync_items_loop") ); + _retrigger_fetch_sync_items_loop_promise = fc::promise::create("graphene::net::retrigger_fetch_sync_items_loop"); _retrigger_fetch_sync_items_loop_promise->wait(); _retrigger_fetch_sync_items_loop_promise.reset(); } @@ -1205,7 +1205,7 @@ namespace graphene { namespace net { namespace detail { if (!_items_to_fetch_updated) { - _retrigger_fetch_item_loop_promise = fc::promise::ptr(new fc::promise("graphene::net::retrigger_fetch_item_loop")); + _retrigger_fetch_item_loop_promise = fc::promise::create("graphene::net::retrigger_fetch_item_loop"); fc::microseconds time_until_retrigger = fc::microseconds::maximum(); if (next_peer_unblocked_time != fc::time_point::maximum()) time_until_retrigger = next_peer_unblocked_time - fc::time_point::now(); @@ -1297,7 +1297,7 @@ namespace graphene { namespace net { namespace detail { if (_new_inventory.empty()) { - _retrigger_advertise_inventory_loop_promise = fc::promise::ptr(new fc::promise("graphene::net::retrigger_advertise_inventory_loop")); + _retrigger_advertise_inventory_loop_promise = fc::promise::create("graphene::net::retrigger_advertise_inventory_loop"); _retrigger_advertise_inventory_loop_promise->wait(); _retrigger_advertise_inventory_loop_promise.reset(); } diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp index 3fd1051b..98c68835 100644 --- a/programs/cli_wallet/main.cpp +++ b/programs/cli_wallet/main.cpp @@ -266,7 +266,7 @@ int main( int argc, char** argv ) } else { - fc::promise::ptr exit_promise = new fc::promise("UNIX Signal Handler"); + fc::promise::ptr exit_promise = fc::promise::create("UNIX Signal Handler"); fc::set_signal_handler([&exit_promise](int signal) { exit_promise->set_value(signal); }, SIGINT); diff --git a/programs/delayed_node/main.cpp b/programs/delayed_node/main.cpp index 112b7dee..23f9b08b 100644 --- a/programs/delayed_node/main.cpp +++ b/programs/delayed_node/main.cpp @@ -166,7 +166,7 @@ int main(int argc, char** argv) { node.startup(); node.startup_plugins(); - fc::promise::ptr exit_promise = new fc::promise("UNIX Signal Handler"); + fc::promise::ptr exit_promise = fc::promise::create("UNIX Signal Handler"); fc::set_signal_handler([&exit_promise](int signal) { exit_promise->set_value(signal); }, SIGINT); diff --git a/programs/size_checker/main.cpp b/programs/size_checker/main.cpp index 188e88e4..3015e1cd 100644 --- a/programs/size_checker/main.cpp +++ b/programs/size_checker/main.cpp @@ -23,6 +23,7 @@ */ #include +#include #include #include diff --git a/programs/witness_node/main.cpp b/programs/witness_node/main.cpp index 4d49d96f..f62119d2 100644 --- a/programs/witness_node/main.cpp +++ b/programs/witness_node/main.cpp @@ -136,7 +136,7 @@ int main(int argc, char** argv) { node->startup(); node->startup_plugins(); - fc::promise::ptr exit_promise = new fc::promise("UNIX Signal Handler"); + fc::promise::ptr exit_promise = fc::promise::create("UNIX Signal Handler"); fc::set_signal_handler([&exit_promise](int signal) { elog( "Caught SIGINT attempting to exit cleanly" );