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

fix warnings

Browse source
This commit is contained in:
Daniel Larimer 2015-09-11 08:53:50 -04:00
parent 358a88037c
commit b3052dfcc1
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs

@ -1 +1 @@
Subproject commit c004ae42a72d86bbc6c7e8d065deed284fd093a5
Subproject commit cdc8ea8133a999afef8051700a4ce8edb0988ec4

2
libraries/chain/db_init.cpp
View file

@ -588,7 +588,7 @@ void database::init_genesis(const genesis_state_type& genesis_state)
// Set active witnesses
modify(get_global_properties(), [&](global_property_object& p) {
for( int i = 1; i <= genesis_state.initial_active_witnesses; ++i )
for( uint32_t i = 1; i <= genesis_state.initial_active_witnesses; ++i )
{
p.active_witnesses.insert(i);
p.witness_accounts.insert(get(witness_id_type(i)).witness_account);

2
libraries/chain/db_maint.cpp
View file

@ -118,7 +118,7 @@ void database::pay_workers( share_type& budget )
return wa.id < wb.id;
});
for( int i = 0; i < active_workers.size() && budget > 0; ++i )
for( uint32_t i = 0; i < active_workers.size() && budget > 0; ++i )
{
const worker_object& active_worker = active_workers[i];
share_type requested_pay = active_worker.daily_pay;

7
libraries/chain/include/graphene/chain/protocol/address.hpp
View file

@ -56,7 +56,12 @@ namespace graphene { namespace chain {
explicit operator std::string()const; ///< converts to base58 + checksum
friend size_t hash_value( const address& v ) { return *((size_t*)&v.addr._hash[2]); }
friend size_t hash_value( const address& v ) {
const void* tmp = static_cast<const void*>(v.addr._hash+2);
const size_t* tmp2 = reinterpret_cast<const size_t*>(tmp);
return *tmp2;
}
fc::ripemd160 addr;
};
inline bool operator == ( const address& a, const address& b ) { return a.addr == b.addr; }