Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fix some compiler warnings

Browse source
This commit is contained in:
Vikram Rajkumar 2015-06-23 17:41:09 -04:00
parent 1e62c749af
commit b63de0ad29
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/chain/account_object.cpp
View file

@ -87,9 +87,12 @@ void account_statistics_object::process_fees(const account_object& a, database&
share_type network_cut = cut_fee(core_fee_total, account.network_fee_percentage); share_type network_cut = cut_fee(core_fee_total, account.network_fee_percentage);
assert( network_cut <= core_fee_total ); assert( network_cut <= core_fee_total );
#ifndef NDEBUG
share_type burned = cut_fee(network_cut, props.parameters.burn_percent_of_fee); share_type burned = cut_fee(network_cut, props.parameters.burn_percent_of_fee);
share_type accumulated = network_cut - burned; share_type accumulated = network_cut - burned;
assert( accumulated + burned == network_cut ); assert( accumulated + burned == network_cut );
#endif
share_type lifetime_cut = cut_fee(core_fee_total, account.lifetime_referrer_fee_percentage); share_type lifetime_cut = cut_fee(core_fee_total, account.lifetime_referrer_fee_percentage);
share_type referral = core_fee_total - network_cut - lifetime_cut; share_type referral = core_fee_total - network_cut - lifetime_cut;

2
libraries/chain/db_init.cpp
View file

@ -334,7 +334,9 @@ void database::init_genesis(const genesis_state_type& genesis_state)
}); });
// Initialize witness schedule // Initialize witness schedule
#ifndef NDEBUG
const witness_schedule_object& wso = const witness_schedule_object& wso =
#endif
create<witness_schedule_object>([&](witness_schedule_object& _wso) create<witness_schedule_object>([&](witness_schedule_object& _wso)
{ {
memset(_wso.rng_seed.begin(), 0, _wso.rng_seed.size()); memset(_wso.rng_seed.begin(), 0, _wso.rng_seed.size());

3
libraries/chain/include/graphene/chain/witness_scheduler.hpp
View file

@ -40,6 +40,7 @@ class generic_witness_scheduler
public: public:
void check_invariant() const void check_invariant() const
{ {
#ifndef NDEBUG
CountType tokens = _ineligible_no_turn.size() + _eligible.size(); CountType tokens = _ineligible_no_turn.size() + _eligible.size();
CountType turns = _eligible.size(); CountType turns = _eligible.size();
for( const std::pair< WitnessID, bool >& item : _ineligible_waiting_for_token ) for( const std::pair< WitnessID, bool >& item : _ineligible_waiting_for_token )
@ -47,7 +48,7 @@ class generic_witness_scheduler
assert( _tokens == tokens ); assert( _tokens == tokens );
assert( _turns == turns ); assert( _turns == turns );
#endif
flat_set< WitnessID > witness_set; flat_set< WitnessID > witness_set;
// make sure each witness_id occurs only once among the three states // make sure each witness_id occurs only once among the three states

2
tests/tests/operation_tests.cpp
View file

@ -249,7 +249,7 @@ BOOST_AUTO_TEST_CASE( black_swan )
publish_feed( bitusd, feedproducer, current_feed ); publish_feed( bitusd, feedproducer, current_feed );
/// this sell order is designed to trigger a black swan /// this sell order is designed to trigger a black swan
create_sell_order(borrower2, bitusd.amount(1000), core.amount(3000)); create_sell_order( borrower2, bitusd.amount(1000), core.amount(3000) );
FC_ASSERT( bitusd.bitasset_data(db).has_settlement() ); FC_ASSERT( bitusd.bitasset_data(db).has_settlement() );