Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Replace improper static_variant operator overloads with comparators

Browse source
This commit is contained in:
Nathan Hourt 2019-08-28 15:46:33 -05:00 committed by Nathan Hourt
parent 54ce371a4a
commit 13a76d25ac
No known key found for this signature in database
GPG key ID: B4344309A110851E
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/chain/include/graphene/chain/protocol/base.hpp
View file

@ -118,7 +118,7 @@ namespace graphene { namespace chain {
* @note static_variant compares only the type tag and not the * @note static_variant compares only the type tag and not the
* content. * content.
*/ */
typedef flat_set<future_extensions> extensions_type; typedef future_extensions::flat_set_type extensions_type;
///@} ///@}

2
libraries/chain/include/graphene/chain/protocol/fee_schedule.hpp
View file

@ -75,7 +75,7 @@ namespace graphene { namespace chain {
/** /**
* @note must be sorted by fee_parameters.which() and have no duplicates * @note must be sorted by fee_parameters.which() and have no duplicates
*/ */
flat_set<fee_parameters> parameters; fee_parameters::flat_set_type parameters;
uint32_t scale = GRAPHENE_100_PERCENT; ///< fee * scale / GRAPHENE_100_PERCENT uint32_t scale = GRAPHENE_100_PERCENT; ///< fee * scale / GRAPHENE_100_PERCENT
}; };

2
tests/common/database_fixture.cpp
View file

@ -669,7 +669,7 @@ void database_fixture::issue_uia( account_id_type recipient_id, asset amount )
} }
void database_fixture::change_fees( void database_fixture::change_fees(
const flat_set< fee_parameters >& new_params, const fee_parameters::flat_set_type& new_params,
uint32_t new_scale /* = 0 */ uint32_t new_scale /* = 0 */
) )
{ {

2
tests/common/database_fixture.hpp
View file

@ -281,7 +281,7 @@ struct database_fixture {
void transfer( const account_object& from, const account_object& to, const asset& amount, const asset& fee = asset() ); void transfer( const account_object& from, const account_object& to, const asset& amount, const asset& fee = asset() );
void fund_fee_pool( const account_object& from, const asset_object& asset_to_fund, const share_type amount ); void fund_fee_pool( const account_object& from, const asset_object& asset_to_fund, const share_type amount );
void enable_fees(); void enable_fees();
void change_fees( const flat_set< fee_parameters >& new_params, uint32_t new_scale = 0 ); void change_fees( const fee_parameters::flat_set_type& new_params, uint32_t new_scale = 0 );
void upgrade_to_lifetime_member( account_id_type account ); void upgrade_to_lifetime_member( account_id_type account );
void upgrade_to_lifetime_member( const account_object& account ); void upgrade_to_lifetime_member( const account_object& account );
void upgrade_to_annual_member( account_id_type account ); void upgrade_to_annual_member( account_id_type account );