Merge pull request #1274 from EOSIO/eosbios-gcc-compatibility

Rename symbol accessor in asset to avoid confusing gcc

libraries/chain/include/eosio/chain/asset.hpp

@@ -39,34 +39,34 @@ struct asset
    uint8_t     decimals()const;
    string      symbol_name()const;
    int64_t     precision()const;
-   const symbol& symbol() const { return sym; }
+   const symbol& get_symbol() const { return sym; }
 
    static asset from_string(const string& from);
    string       to_string()const;
 
    asset& operator += (const asset& o)
    {
-      FC_ASSERT(symbol() == o.symbol());
+      FC_ASSERT(get_symbol() == o.get_symbol());
       amount += o.amount;
       return *this;
    }
 
    asset& operator -= (const asset& o)
    {
-      FC_ASSERT(symbol() == o.symbol());
+      FC_ASSERT(get_symbol() == o.get_symbol());
       amount -= o.amount;
       return *this;
    }
-   asset operator -()const { return asset(-amount, symbol()); }
+   asset operator -()const { return asset(-amount, get_symbol()); }
 
    friend bool operator == (const asset& a, const asset& b)
    {
-      return std::tie(a.symbol(), a.amount) == std::tie(b.symbol(), b.amount);
+      return std::tie(a.get_symbol(), a.amount) == std::tie(b.get_symbol(), b.amount);
    }
    friend bool operator < (const asset& a, const asset& b)
    {
-      FC_ASSERT(a.symbol() == b.symbol());
-      return std::tie(a.amount,a.symbol()) < std::tie(b.amount,b.symbol());
+      FC_ASSERT(a.get_symbol() == b.get_symbol());
+      return std::tie(a.amount,a.get_symbol()) < std::tie(b.amount,b.get_symbol());
    }
    friend bool operator <= (const asset& a, const asset& b) { return (a == b) || (a < b); }
    friend bool operator != (const asset& a, const asset& b) { return !(a == b); }
@@ -74,13 +74,13 @@ struct asset
    friend bool operator >= (const asset& a, const asset& b) { return !(a < b);  }
 
    friend asset operator - (const asset& a, const asset& b) {
-      FC_ASSERT(a.symbol() == b.symbol());
-      return asset(a.amount - b.amount, a.symbol());
+      FC_ASSERT(a.get_symbol() == b.get_symbol());
+      return asset(a.amount - b.amount, a.get_symbol());
    }
 
    friend asset operator + (const asset& a, const asset& b) {
-      FC_ASSERT(a.symbol() == b.symbol());
-      return asset(a.amount + b.amount, a.symbol());
+      FC_ASSERT(a.get_symbol() == b.get_symbol());
+      return asset(a.amount + b.amount, a.get_symbol());
    }
 
    friend std::ostream& operator << (std::ostream& out, const asset& a) { return out << a.to_string(); }

tests/wasm_tests/currency_tests.cpp

@@ -51,7 +51,7 @@ BOOST_FIXTURE_TEST_CASE( test_generic_currency, tester ) try {
          std::cerr << act.console << "\n";
       produce_block();
 
-      auto actual = get_currency_balance(N(currency), expected.symbol(), N(usera));
+      auto actual = get_currency_balance(N(currency), expected.get_symbol(), N(usera));
       BOOST_REQUIRE_EQUAL(expected, actual);
    }
 
@@ -93,7 +93,7 @@ BOOST_FIXTURE_TEST_CASE( test_currency, tester ) try {
       produce_block();
 
       BOOST_REQUIRE_EQUAL(true, chain_has_transaction(trx.id()));
-      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.symbol(), N(currency)), asset::from_string( "1000000.0000 CUR" ));
+      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.get_symbol(), N(currency)), asset::from_string( "1000000.0000 CUR" ));
    }
 
    // make a transfer from the contract to a user
@@ -117,7 +117,7 @@ BOOST_FIXTURE_TEST_CASE( test_currency, tester ) try {
       produce_block();
 
       BOOST_REQUIRE_EQUAL(true, chain_has_transaction(trx.id()));
-      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.symbol(), N(alice)), asset::from_string( "100.0000 CUR" ));
+      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.get_symbol(), N(alice)), asset::from_string( "100.0000 CUR" ));
    }
 
    // Overspend!
@@ -141,8 +141,8 @@ BOOST_FIXTURE_TEST_CASE( test_currency, tester ) try {
       produce_block();
 
       BOOST_REQUIRE_EQUAL(false, chain_has_transaction(trx.id()));
-      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.symbol(), N(alice)), asset::from_string( "100.0000 CUR" ));
-      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.symbol(), N(bob)), asset::from_string( "0.0000 CUR" ));
+      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.get_symbol(), N(alice)), asset::from_string( "100.0000 CUR" ));
+      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.get_symbol(), N(bob)), asset::from_string( "0.0000 CUR" ));
    }
 
    // Full spend
@@ -166,8 +166,8 @@ BOOST_FIXTURE_TEST_CASE( test_currency, tester ) try {
       produce_block();
 
       BOOST_REQUIRE_EQUAL(true, chain_has_transaction(trx.id()));
-      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.symbol(), N(alice)), asset::from_string( "0.0000 CUR" ));
-      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.symbol(), N(bob)), asset::from_string( "100.0000 CUR" ));
+      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.get_symbol(), N(alice)), asset::from_string( "0.0000 CUR" ));
+      BOOST_REQUIRE_EQUAL(get_currency_balance(N(currency), token_supply.get_symbol(), N(bob)), asset::from_string( "100.0000 CUR" ));
    }
 
 } FC_LOG_AND_RETHROW() /// test_currency