Skip to content

Commit 6b6a73d

Browse files
committed
Update a variable name to fix variable shadowing
1 parent 1195df5 commit 6b6a73d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

libraries/chain/market_evaluator.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ void limit_order_update_evaluator::process_deferred_fee()
255255

256256
share_type deferred_fee = _order->deferred_fee;
257257
asset deferred_paid_fee = _order->deferred_paid_fee;
258-
const asset_dynamic_data_object* fee_asset_dyn_data = nullptr;
258+
const asset_dynamic_data_object* deferred_fee_asset_dyn_data = nullptr;
259259
const auto& current_fees = d.current_fee_schedule();
260260
asset core_cancel_fee = current_fees.calculate_fee( limit_order_cancel_operation() );
261261
if( core_cancel_fee.amount > 0 )
@@ -297,8 +297,8 @@ void limit_order_update_evaluator::process_deferred_fee()
297297
fee128 /= _order->deferred_fee.value;
298298
share_type cancel_fee_amount = static_cast<int64_t>(fee128);
299299
// cancel_fee should be positive, pay it to asset's accumulated_fees
300-
fee_asset_dyn_data = &deferred_paid_fee.asset_id(d).dynamic_asset_data_id(d);
301-
d.modify( *fee_asset_dyn_data, [&cancel_fee_amount](asset_dynamic_data_object& addo) {
300+
deferred_fee_asset_dyn_data = &deferred_paid_fee.asset_id(d).dynamic_asset_data_id(d);
301+
d.modify( *deferred_fee_asset_dyn_data, [&cancel_fee_amount](asset_dynamic_data_object& addo) {
302302
addo.accumulated_fees += cancel_fee_amount;
303303
});
304304
// cancel_fee should be no more than deferred_paid_fee
@@ -318,9 +318,9 @@ void limit_order_update_evaluator::process_deferred_fee()
318318
{
319319
d.adjust_balance( _order->seller, deferred_paid_fee );
320320
// be here, must have: fee_asset != CORE
321-
if( !fee_asset_dyn_data )
322-
fee_asset_dyn_data = &deferred_paid_fee.asset_id(d).dynamic_asset_data_id(d);
323-
d.modify( *fee_asset_dyn_data, [&deferred_fee](asset_dynamic_data_object& addo) {
321+
if( !deferred_fee_asset_dyn_data )
322+
deferred_fee_asset_dyn_data = &deferred_paid_fee.asset_id(d).dynamic_asset_data_id(d);
323+
d.modify( *deferred_fee_asset_dyn_data, [&deferred_fee](asset_dynamic_data_object& addo) {
324324
addo.fee_pool += deferred_fee;
325325
});
326326
}

0 commit comments

Comments
 (0)