From 600a06f57ef7700b00fec111e0e43b05ab84fa85 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 21 Jan 2016 10:21:35 -0500 Subject: [PATCH] db_balance.cpp: Rename by_balance -> by_account_asset #529 --- libraries/chain/db_balance.cpp | 4 ++-- libraries/chain/include/graphene/chain/account_object.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/chain/db_balance.cpp b/libraries/chain/db_balance.cpp index 539b61c3..a70f077b 100644 --- a/libraries/chain/db_balance.cpp +++ b/libraries/chain/db_balance.cpp @@ -33,7 +33,7 @@ namespace graphene { namespace chain { asset database::get_balance(account_id_type owner, asset_id_type asset_id) const { - auto& index = get_index_type().indices().get(); + auto& index = get_index_type().indices().get(); auto itr = index.find(boost::make_tuple(owner, asset_id)); if( itr == index.end() ) return asset(0, asset_id); @@ -55,7 +55,7 @@ void database::adjust_balance(account_id_type account, asset delta ) if( delta.amount == 0 ) return; - auto& index = get_index_type().indices().get(); + auto& index = get_index_type().indices().get(); auto itr = index.find(boost::make_tuple(account, delta.asset_id)); if(itr == index.end()) { diff --git a/libraries/chain/include/graphene/chain/account_object.hpp b/libraries/chain/include/graphene/chain/account_object.hpp index 89d93b74..a0cf2da5 100644 --- a/libraries/chain/include/graphene/chain/account_object.hpp +++ b/libraries/chain/include/graphene/chain/account_object.hpp @@ -291,7 +291,7 @@ namespace graphene { namespace chain { struct by_asset; struct by_account; - struct by_balance; + struct by_account_asset; /** * @ingroup object_index */ @@ -299,7 +299,7 @@ namespace graphene { namespace chain { account_balance_object, indexed_by< ordered_unique< tag, member< object, object_id_type, &object::id > >, - ordered_unique< tag, composite_key< + ordered_unique< tag, composite_key< account_balance_object, member, member >