From 13a76d25ac81358294dbbf5f96bd20bd4e5f2404 Mon Sep 17 00:00:00 2001
From: Nathan Hourt <themodprobe@protonmail.com>
Date: Wed, 28 Aug 2019 15:46:33 -0500
Subject: [PATCH] Replace improper static_variant operator overloads with
 comparators

---
 libraries/chain/include/graphene/chain/protocol/base.hpp        | 2 +-
 .../chain/include/graphene/chain/protocol/fee_schedule.hpp      | 2 +-
 tests/common/database_fixture.cpp                               | 2 +-
 tests/common/database_fixture.hpp                               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/include/graphene/chain/protocol/base.hpp b/libraries/chain/include/graphene/chain/protocol/base.hpp
index 23c285d3..676d28ff 100644
--- a/libraries/chain/include/graphene/chain/protocol/base.hpp
+++ b/libraries/chain/include/graphene/chain/protocol/base.hpp
@@ -118,7 +118,7 @@ namespace graphene { namespace chain {
     *  @note static_variant compares only the type tag and not the 
     *  content.
     */
-   typedef flat_set<future_extensions> extensions_type;
+   typedef future_extensions::flat_set_type extensions_type;
 
    ///@}
 
diff --git a/libraries/chain/include/graphene/chain/protocol/fee_schedule.hpp b/libraries/chain/include/graphene/chain/protocol/fee_schedule.hpp
index 0dd8ca6f..1587d1ba 100644
--- a/libraries/chain/include/graphene/chain/protocol/fee_schedule.hpp
+++ b/libraries/chain/include/graphene/chain/protocol/fee_schedule.hpp
@@ -75,7 +75,7 @@ namespace graphene { namespace chain {
       /**
        *  @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
    };
 
diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp
index be095092..2ffddd90 100644
--- a/tests/common/database_fixture.cpp
+++ b/tests/common/database_fixture.cpp
@@ -669,7 +669,7 @@ void database_fixture::issue_uia( account_id_type recipient_id, asset amount )
 }
 
 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 */
    )
 {
diff --git a/tests/common/database_fixture.hpp b/tests/common/database_fixture.hpp
index 25a87855..487b66dc 100644
--- a/tests/common/database_fixture.hpp
+++ b/tests/common/database_fixture.hpp
@@ -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 fund_fee_pool( const account_object& from, const asset_object& asset_to_fund, const share_type amount );
    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( const account_object& account );
    void upgrade_to_annual_member( account_id_type account );