From bb46f84666eb02b68b136460cfecf5605e05a41e Mon Sep 17 00:00:00 2001 From: Roman Olearski Date: Wed, 12 Jul 2017 10:55:03 +0200 Subject: [PATCH] Fixing double declared enumerated types with FC_REFLECT_TYPENAME FC_REFLECT_ENUM Adapting fc --- docs | 2 +- libraries/app/application.cpp | 4 ++-- libraries/chain/include/graphene/chain/protocol/account.hpp | 2 +- libraries/chain/include/graphene/chain/protocol/authority.hpp | 2 +- .../include/graphene/chain/protocol/rock_paper_scissors.hpp | 2 +- libraries/chain/include/graphene/chain/protocol/vote.hpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs b/docs index 97435c1a..bd792d02 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 97435c1a622e41e0a5fc1be72aaadea62e1b7adb +Subproject commit bd792d02c70e7686da2b27197eba4fd6df30477c diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index ea5789b8..b57531b3 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -212,7 +212,7 @@ namespace detail { bool enable_deflate_compression = _options->count("enable-permessage-deflate") != 0; - _websocket_server = std::make_shared(enable_deflate_compression); + _websocket_server = std::make_shared(); _websocket_server->on_connection([&]( const fc::http::websocket_connection_ptr& c ){ auto wsc = std::make_shared(*c); @@ -240,7 +240,7 @@ namespace detail { string password = _options->count("server-pem-password") ? _options->at("server-pem-password").as() : ""; bool enable_deflate_compression = _options->count("enable-permessage-deflate") != 0; - _websocket_tls_server = std::make_shared( _options->at("server-pem").as(), password, enable_deflate_compression ); + _websocket_tls_server = std::make_shared( _options->at("server-pem").as(), password ); _websocket_tls_server->on_connection([&]( const fc::http::websocket_connection_ptr& c ){ auto wsc = std::make_shared(*c); diff --git a/libraries/chain/include/graphene/chain/protocol/account.hpp b/libraries/chain/include/graphene/chain/protocol/account.hpp index 329d03e2..969a7ad7 100644 --- a/libraries/chain/include/graphene/chain/protocol/account.hpp +++ b/libraries/chain/include/graphene/chain/protocol/account.hpp @@ -264,7 +264,7 @@ namespace graphene { namespace chain { } } // graphene::chain FC_REFLECT(graphene::chain::account_options, (memo_key)(voting_account)(num_witness)(num_committee)(votes)(extensions)) -FC_REFLECT_TYPENAME( graphene::chain::account_whitelist_operation::account_listing) +// romek FC_REFLECT_TYPENAME( graphene::chain::account_whitelist_operation::account_listing) FC_REFLECT_ENUM( graphene::chain::account_whitelist_operation::account_listing, (no_listing)(white_listed)(black_listed)(white_and_black_listed)) diff --git a/libraries/chain/include/graphene/chain/protocol/authority.hpp b/libraries/chain/include/graphene/chain/protocol/authority.hpp index b6ef60d7..1c615fae 100644 --- a/libraries/chain/include/graphene/chain/protocol/authority.hpp +++ b/libraries/chain/include/graphene/chain/protocol/authority.hpp @@ -132,5 +132,5 @@ void add_authority_accounts( } } // namespace graphene::chain FC_REFLECT( graphene::chain::authority, (weight_threshold)(account_auths)(key_auths)(address_auths) ) -FC_REFLECT_TYPENAME( graphene::chain::authority::classification ) +// romek FC_REFLECT_TYPENAME( graphene::chain::authority::classification ) FC_REFLECT_ENUM( graphene::chain::authority::classification, (owner)(active)(key) ) diff --git a/libraries/chain/include/graphene/chain/protocol/rock_paper_scissors.hpp b/libraries/chain/include/graphene/chain/protocol/rock_paper_scissors.hpp index 1d377e0f..893d4eaa 100644 --- a/libraries/chain/include/graphene/chain/protocol/rock_paper_scissors.hpp +++ b/libraries/chain/include/graphene/chain/protocol/rock_paper_scissors.hpp @@ -94,7 +94,7 @@ namespace graphene { namespace chain { FC_REFLECT( graphene::chain::rock_paper_scissors_game_options, (insurance_enabled)(time_per_commit_move)(time_per_reveal_move)(number_of_gestures) ) -FC_REFLECT_TYPENAME( graphene::chain::rock_paper_scissors_gesture) +// romek FC_REFLECT_TYPENAME( graphene::chain::rock_paper_scissors_gesture) FC_REFLECT_ENUM( graphene::chain::rock_paper_scissors_gesture, (rock) (paper) diff --git a/libraries/chain/include/graphene/chain/protocol/vote.hpp b/libraries/chain/include/graphene/chain/protocol/vote.hpp index b93b9d03..62010406 100644 --- a/libraries/chain/include/graphene/chain/protocol/vote.hpp +++ b/libraries/chain/include/graphene/chain/protocol/vote.hpp @@ -146,7 +146,7 @@ void from_variant( const fc::variant& var, graphene::chain::vote_id_type& vo ); } // fc -FC_REFLECT_TYPENAME( graphene::chain::vote_id_type::vote_type ) +// romek FC_REFLECT_TYPENAME( graphene::chain::vote_id_type::vote_type ) FC_REFLECT_TYPENAME( fc::flat_set ) FC_REFLECT_ENUM( graphene::chain::vote_id_type::vote_type, (witness)(committee)(worker)(VOTE_TYPE_COUNT) )