Add missing comparisons

taokayan · Aug 10, 2018 · c3aed5c · c3aed5c
1 parent 7a5a543
commit c3aed5c
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 1 deletion.
diff --git a/libraries/eosiolib/asset.hpp b/libraries/eosiolib/asset.hpp
@@ -468,6 +468,49 @@ namespace eosio {
          return {a.quantity + b.quantity, a.contract};
       }
 
+      /// Addition operator.
+      friend extended_asset& operator+=( extended_asset& a, const extended_asset& b ) {
+         eosio_assert( a.contract == b.contract, "type mismatch" );
+         a.quantity += b.quantity;
+         return a;
+      }
+
+      /// Subtraction operator.
+      friend extended_asset& operator-=( extended_asset& a, const extended_asset& b ) {
+         eosio_assert( a.contract == b.contract, "type mismatch" );
+         a.quantity -= b.quantity;
+         return a;
+      }
+
+      /// Less than operator
+      friend bool operator<( const extended_asset& a, const extended_asset& b ) {
+         eosio_assert( a.contract == b.contract, "type mismatch" );
+         return a.quantity < b.quantity;
+      }
+
+
+      /// Comparison operator
+      friend bool operator==( const extended_asset& a, const extended_asset& b ) {
+         return std::tie(a.quantity, a.contract) == std::tie(b.quantity, b.contract);
+      }
+
+      /// Comparison operator
+      friend bool operator!=( const extended_asset& a, const extended_asset& b ) {
+         return std::tie(a.quantity, a.contract) != std::tie(b.quantity, b.contract);
+      }
+
+      /// Comparison operator
+      friend bool operator<=( const extended_asset& a, const extended_asset& b ) {
+         eosio_assert( a.contract == b.contract, "type mismatch" );
+         return a.quantity <= b.quantity;
+      }
+
+      /// Comparison operator
+      friend bool operator>=( const extended_asset& a, const extended_asset& b ) {
+         eosio_assert( a.contract == b.contract, "type mismatch" );
+         return a.quantity >= b.quantity;
+      }
+
       EOSLIB_SERIALIZE( extended_asset, (quantity)(contract) )
    };
 

diff --git a/libraries/eosiolib/currency.hpp b/libraries/eosiolib/currency.hpp
@@ -94,7 +94,7 @@ namespace eosio {
          }
 
          static void inline_transfer( account_name from, account_name to, extended_asset amount, string memo = string(), permission_name perm = N(active) ) {
-            action act( permission_level( from, perm ), amount.contract, N(transfer), transfer{from,to,amount,memo} );
+            action act( permission_level( from, perm ), amount.contract, N(transfer), transfer{from,to,amount.quantity,memo} );
             act.send();
          }