From af3738782df6a7a75b72ba5017a5aefcf9addc86 Mon Sep 17 00:00:00 2001 From: gladcow Date: Wed, 2 Oct 2019 18:52:43 +0300 Subject: [PATCH] fix compilation --- libraries/app/application.cpp | 2 +- libraries/app/config_util.cpp | 9 +++++---- libraries/plugins/delayed_node/delayed_node_plugin.cpp | 2 +- programs/cli_wallet/main.cpp | 6 +++--- programs/delayed_node/main.cpp | 2 +- programs/witness_node/main.cpp | 6 ++++++ tests/cli/main.cpp | 7 ++++--- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index ee190c3e..48a9f4ee 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -244,7 +244,7 @@ namespace detail { void new_connection( const fc::http::websocket_connection_ptr& c ) { - auto wsc = std::make_shared(c); + auto wsc = std::make_shared(*c, 1); auto login = std::make_shared( std::ref(*_self) ); login->enable_api("database_api"); diff --git a/libraries/app/config_util.cpp b/libraries/app/config_util.cpp index 797e3131..909dea56 100644 --- a/libraries/app/config_util.cpp +++ b/libraries/app/config_util.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -150,8 +151,8 @@ static fc::optional load_logging_config_from_ini_file(const console_appender_config.level_colors.emplace_back( fc::console_appender::level_color(fc::log_level::error, fc::console_appender::color::cyan)); - console_appender_config.stream = fc::variant(stream_name).as(); - logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config))); + console_appender_config.stream = fc::variant(stream_name).as(GRAPHENE_MAX_NESTED_OBJECTS); + logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config, 1))); found_logging_config = true; } else if (boost::starts_with(section_name, file_appender_section_prefix)) @@ -172,7 +173,7 @@ static fc::optional load_logging_config_from_ini_file(const file_appender_config.rotate = true; file_appender_config.rotation_interval = fc::minutes(interval); file_appender_config.rotation_limit = fc::days(limit); - logging_config.appenders.push_back(fc::appender_config(file_appender_name, "file", fc::variant(file_appender_config))); + logging_config.appenders.push_back(fc::appender_config(file_appender_name, "file", fc::variant(file_appender_config, 1))); found_logging_config = true; } else if (boost::starts_with(section_name, logger_section_prefix)) @@ -181,7 +182,7 @@ static fc::optional load_logging_config_from_ini_file(const std::string level_string = section_tree.get("level"); std::string appenders_string = section_tree.get("appenders"); fc::logger_config logger_config(logger_name); - logger_config.level = fc::variant(level_string).as(); + logger_config.level = fc::variant(level_string).as(1); boost::split(logger_config.appenders, appenders_string, boost::is_any_of(" ,"), boost::token_compress_on); diff --git a/libraries/plugins/delayed_node/delayed_node_plugin.cpp b/libraries/plugins/delayed_node/delayed_node_plugin.cpp index ce744e2f..ecbfcf84 100644 --- a/libraries/plugins/delayed_node/delayed_node_plugin.cpp +++ b/libraries/plugins/delayed_node/delayed_node_plugin.cpp @@ -65,7 +65,7 @@ void delayed_node_plugin::plugin_set_program_options(bpo::options_description& c void delayed_node_plugin::connect() { - my->client_connection = std::make_shared(my->client.connect(my->remote_endpoint)); + my->client_connection = std::make_shared(*(my->client.connect(my->remote_endpoint)), 1); my->database_api = my->client_connection->get_remote_api(0); my->client_connection_closed = my->client_connection->closed.connect([this] { connection_failed(); diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp index 62e6ee79..9cb8750d 100644 --- a/programs/cli_wallet/main.cpp +++ b/programs/cli_wallet/main.cpp @@ -174,7 +174,7 @@ int main( int argc, char** argv ) fc::http::websocket_client client; idump((wdata.ws_server)); auto con = client.connect( wdata.ws_server ); - auto apic = std::make_shared(con); + auto apic = std::make_shared(*con, GRAPHENE_MAX_NESTED_OBJECTS); auto remote_api = apic->get_remote_api< login_api >(1); edump((wdata.ws_user)(wdata.ws_password) ); @@ -213,7 +213,7 @@ int main( int argc, char** argv ) _websocket_server->on_connection([&wapi]( const fc::http::websocket_connection_ptr& c ){ std::cout << "here... \n"; wlog("." ); - auto wsc = std::make_shared(c); + auto wsc = std::make_shared(*c, GRAPHENE_MAX_NESTED_OBJECTS); wsc->register_api(wapi); c->set_session_data( wsc ); }); @@ -230,7 +230,7 @@ int main( int argc, char** argv ) if( options.count("rpc-tls-endpoint") ) { _websocket_tls_server->on_connection([&]( const fc::http::websocket_connection_ptr& c ){ - auto wsc = std::make_shared(c); + auto wsc = std::make_shared(*c, GRAPHENE_MAX_NESTED_OBJECTS); wsc->register_api(wapi); c->set_session_data( wsc ); }); diff --git a/programs/delayed_node/main.cpp b/programs/delayed_node/main.cpp index 3e058b64..83f48f3b 100644 --- a/programs/delayed_node/main.cpp +++ b/programs/delayed_node/main.cpp @@ -259,7 +259,7 @@ fc::optional load_logging_config_from_ini_file(const fc::pat console_appender_config.level_colors.emplace_back( fc::console_appender::level_color(fc::log_level::error, fc::console_appender::color::cyan)); - console_appender_config.stream = fc::variant(stream_name, 1).as(1); + console_appender_config.stream = fc::variant(stream_name, GRAPHENE_MAX_NESTED_OBJECTS).as(GRAPHENE_MAX_NESTED_OBJECTS); logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config, GRAPHENE_MAX_NESTED_OBJECTS))); found_logging_config = true; } diff --git a/programs/witness_node/main.cpp b/programs/witness_node/main.cpp index d91a0720..6fa79255 100644 --- a/programs/witness_node/main.cpp +++ b/programs/witness_node/main.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include //#include //#include @@ -38,10 +39,14 @@ #include #include +#include +#include +#include #include #include +#include #include #include @@ -309,4 +314,5 @@ fc::optional load_logging_config_from_ini_file(const fc::pat else return fc::optional(); } + FC_RETHROW_EXCEPTIONS(warn, "") } diff --git a/tests/cli/main.cpp b/tests/cli/main.cpp index e5b6dbcf..6a67828e 100644 --- a/tests/cli/main.cpp +++ b/tests/cli/main.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -213,7 +214,7 @@ public: wallet_data.ws_password = ""; websocket_connection = websocket_client.connect( wallet_data.ws_server ); - api_connection = std::make_shared(websocket_connection); + api_connection = std::make_shared(*websocket_connection, GRAPHENE_MAX_NESTED_OBJECTS); remote_login_api = api_connection->get_remote_api< graphene::app::login_api >(1); BOOST_CHECK(remote_login_api->login( wallet_data.ws_user, wallet_data.ws_password ) ); @@ -224,7 +225,7 @@ public: wallet_api = fc::api(wallet_api_ptr); - wallet_cli = std::make_shared(); + wallet_cli = std::make_shared(GRAPHENE_MAX_NESTED_OBJECTS); for( auto& name_formatter : wallet_api_ptr->get_result_formatters() ) wallet_cli->format_result( name_formatter.first, name_formatter.second ); @@ -478,4 +479,4 @@ BOOST_FIXTURE_TEST_CASE( account_history_pagination, cli_fixture ) edump((e.to_detail_string())); throw; } -} \ No newline at end of file +}