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

Win32 compile fixes, no functional changes

Browse source
This commit is contained in:
Eric Frias 2015-07-05 17:58:24 -04:00
parent 3ee8b0c2a4
commit 423eccf4a4
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/chain/db_debug.cpp
View file

@ -85,7 +85,9 @@ void database::debug_dump()
const auto& vbidx = db.get_index_type<simple_index<vesting_balance_object>>(); const auto& vbidx = db.get_index_type<simple_index<vesting_balance_object>>();
for( const auto& s : vbidx ) for( const auto& s : vbidx )
{
idump(("vesting_balance")(s)); idump(("vesting_balance")(s));
}
} }
} } } }

7
libraries/wallet/wallet.cpp
View file

@ -25,7 +25,6 @@
#include <list> #include <list>
#include <boost/range/adaptor/map.hpp> #include <boost/range/adaptor/map.hpp>
#include <boost/range/algorithm_ext/insert.hpp>
#include <boost/range/algorithm_ext/erase.hpp> #include <boost/range/algorithm_ext/erase.hpp>
#include <boost/range/algorithm/unique.hpp> #include <boost/range/algorithm/unique.hpp>
#include <boost/range/algorithm/sort.hpp> #include <boost/range/algorithm/sort.hpp>
@ -523,8 +522,10 @@ public:
// make a list of all current public keys for the named account // make a list of all current public keys for the named account
flat_set<public_key_type> all_keys_for_account; flat_set<public_key_type> all_keys_for_account;
boost::insert(all_keys_for_account, account.active.get_keys()); std::vector<public_key_type> active_keys = account.active.get_keys();
boost::insert(all_keys_for_account, account.owner.get_keys()); std::vector<public_key_type> owner_keys = account.owner.get_keys();
std::copy(active_keys.begin(), active_keys.end(), std::inserter(all_keys_for_account, all_keys_for_account.end()));
std::copy(owner_keys.begin(), owner_keys.end(), std::inserter(all_keys_for_account, all_keys_for_account.end()));
all_keys_for_account.insert(account.options.memo_key); all_keys_for_account.insert(account.options.memo_key);
_keys[wif_pub_key] = wif_key; _keys[wif_pub_key] = wif_key;

3
tests/tests/authority_tests.cpp
View file

@ -427,7 +427,8 @@ BOOST_AUTO_TEST_CASE( genesis_authority )
BOOST_CHECK(db.get<proposal_object>(prop.id).is_authorized_to_execute(db)); BOOST_CHECK(db.get<proposal_object>(prop.id).is_authorized_to_execute(db));
generate_blocks(*prop.review_period_time); generate_blocks(*prop.review_period_time);
uop.key_approvals_to_add = {genesis_key.get_public_key()}; // was 7 uop.key_approvals_to_add.clear();
uop.key_approvals_to_add.insert(genesis_key.get_public_key()); // was 7
trx.operations.back() = uop; trx.operations.back() = uop;
trx.sign( genesis_key); trx.sign( genesis_key);
// Should throw because the transaction is now in review. // Should throw because the transaction is now in review.