Skip to content

Commit 18509eb

Browse files
learnforpracticelearnforpractice
committed
Fix build issues on Ubuntu
1 parent 7bcfdf2 commit 18509eb

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎contracts/eosio.system/delegate_bandwidth.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ namespace eosiosystem {
118118
// If quant.amount == 1, then quant_after_fee.amount == 0 and the next inline transfer will fail causing the buyram action to fail.
119119

120120
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {payer,N(active)},
121-
{ payer, N(eosio.ram), quant_after_fee, std::string("buy ram") } );
121+
std::make_tuple( payer, N(eosio.ram), quant_after_fee, std::string("buy ram")) );
122122

123123
if( fee.amount > 0 ) {
124124
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {payer,N(active)},
125-
{ payer, N(eosio.ramfee), fee, std::string("ram fee") } );
125+
std::make_tuple( payer, N(eosio.ramfee), fee, std::string("ram fee") ) );
126126
}
127127

128128
int64_t bytes_out;
@@ -186,11 +186,11 @@ namespace eosiosystem {
186186
set_resource_limits( res_itr->owner, res_itr->ram_bytes, res_itr->net_weight.amount, res_itr->cpu_weight.amount );
187187

188188
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio.ram),N(active)},
189-
{ N(eosio.ram), account, asset(tokens_out), std::string("sell ram") } );
189+
std::make_tuple( N(eosio.ram), account, asset(tokens_out), std::string("sell ram") ) );
190190
auto fee = tokens_out.amount / 200;
191191
if( fee > 0 ) {
192192
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {account,N(active)},
193-
{ account, N(eosio.ramfee), asset(fee), std::string("sell ram fee") } );
193+
std::make_tuple( account, N(eosio.ramfee), asset(fee), std::string("sell ram fee") ) );
194194
}
195195
}
196196

@@ -330,7 +330,7 @@ namespace eosiosystem {
330330
auto transfer_amount = net_balance + cpu_balance;
331331
if ( asset(0) < transfer_amount ) {
332332
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {source_stake_from, N(active)},
333-
{ source_stake_from, N(eosio.stake), asset(transfer_amount), std::string("stake bandwidth") } );
333+
std::make_tuple( source_stake_from, N(eosio.stake), asset(transfer_amount), std::string("stake bandwidth") ) );
334334
}
335335
}
336336

@@ -395,7 +395,7 @@ namespace eosiosystem {
395395
// consecutive missed blocks.
396396

397397
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio.stake),N(active)},
398-
{ N(eosio.stake), req->owner, req->net_amount + req->cpu_amount, std::string("unstake") } );
398+
std::make_tuple( N(eosio.stake), req->owner, req->net_amount + req->cpu_amount, std::string("unstake") ) );
399399

400400
refunds_tbl.erase( req );
401401
}

‎contracts/eosio.system/eosio.system.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ namespace eosiosystem {
102102
eosio_assert( bid.amount > 0, "insufficient bid" );
103103

104104
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {bidder,N(active)},
105-
{ bidder, N(eosio.names), bid, std::string("bid name ")+(name{newname}).to_string() } );
105+
std::make_tuple( bidder, N(eosio.names), bid, std::string("bid name ")+(name{newname}).to_string() ) );
106106

107107
name_bid_table bids(_self,_self);
108108
print( name{bidder}, " bid ", bid, " on ", name{newname}, "\n" );
@@ -120,8 +120,8 @@ namespace eosiosystem {
120120
eosio_assert( current->high_bidder != bidder, "account is already highest bidder" );
121121

122122
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio.names),N(active)},
123-
{ N(eosio.names), current->high_bidder, asset(current->high_bid),
124-
std::string("refund bid on name ")+(name{newname}).to_string() } );
123+
std::make_tuple( N(eosio.names), current->high_bidder, asset(current->high_bid),
124+
std::string("refund bid on name ")+(name{newname}).to_string() ) );
125125

126126
bids.modify( current, bidder, [&]( auto& b ) {
127127
b.high_bidder = bidder;

‎contracts/eosio.system/producer_pay.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@ namespace eosiosystem {
9090
auto to_per_vote_pay = to_producers - to_per_block_pay;
9191

9292
INLINE_ACTION_SENDER(eosio::token, issue)( N(eosio.token), {{N(eosio),N(active)}},
93-
{N(eosio), asset(new_tokens), std::string("issue tokens for producer pay and savings")} );
93+
std::make_tuple(N(eosio), asset(new_tokens), std::string("issue tokens for producer pay and savings")) );
9494

9595
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio),N(active)},
96-
{ N(eosio), N(eosio.saving), asset(to_savings), "unallocated inflation" } );
96+
std::make_tuple(N(eosio), N(eosio.saving), asset(to_savings), "unallocated inflation") );
9797

9898
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio),N(active)},
99-
{ N(eosio), N(eosio.bpay), asset(to_per_block_pay), "fund per-block bucket" } );
99+
std::make_tuple(N(eosio), N(eosio.bpay), asset(to_per_block_pay), "fund per-block bucket" ) );
100100

101101
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio),N(active)},
102-
{ N(eosio), N(eosio.vpay), asset(to_per_vote_pay), "fund per-vote bucket" } );
102+
std::make_tuple(N(eosio), N(eosio.vpay), asset(to_per_vote_pay), "fund per-vote bucket" ) );
103103

104104
_gstate.pervote_bucket += to_per_vote_pay;
105105
_gstate.perblock_bucket += to_per_block_pay;
@@ -129,11 +129,11 @@ namespace eosiosystem {
129129

130130
if( producer_per_block_pay > 0 ) {
131131
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio.bpay),N(active)},
132-
{ N(eosio.bpay), owner, asset(producer_per_block_pay), std::string("producer block pay") } );
132+
std::make_tuple(N(eosio.bpay), owner, asset(producer_per_block_pay), std::string("producer block pay")) );
133133
}
134134
if( producer_per_vote_pay > 0 ) {
135135
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio.vpay),N(active)},
136-
{ N(eosio.vpay), owner, asset(producer_per_vote_pay), std::string("producer vote pay") } );
136+
std::make_tuple(N(eosio.vpay), owner, asset(producer_per_vote_pay), std::string("producer vote pay") ) );
137137
}
138138
}
139139

‎contracts/eosio.token/eosio.token.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void token::issue( account_name to, asset quantity, string memo )
5555
add_balance( st.issuer, quantity, st.issuer );
5656

5757
if( to != st.issuer ) {
58-
SEND_INLINE_ACTION( *this, transfer, {st.issuer,N(active)}, {st.issuer, to, quantity, memo} );
58+
SEND_INLINE_ACTION( *this, transfer, {st.issuer,N(active)}, std::make_tuple(st.issuer, to, quantity, memo) );
5959
}
6060
}
6161

‎libraries/fc

Submodule fc updated 1 file

‎libraries/python

Submodule python updated 1 file

‎libraries/vm_py

0 commit comments

Comments
 (0)