diff --git a/docs b/docs index c004ae42..cdc8ea81 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit c004ae42a72d86bbc6c7e8d065deed284fd093a5 +Subproject commit cdc8ea8133a999afef8051700a4ce8edb0988ec4 diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 55122d12..6f7a7623 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -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); diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 824e64ae..dd87a9b4 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -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; diff --git a/libraries/chain/include/graphene/chain/protocol/address.hpp b/libraries/chain/include/graphene/chain/protocol/address.hpp index 39f80800..ca264084 100644 --- a/libraries/chain/include/graphene/chain/protocol/address.hpp +++ b/libraries/chain/include/graphene/chain/protocol/address.hpp @@ -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(v.addr._hash+2); + + const size_t* tmp2 = reinterpret_cast(tmp); + return *tmp2; + } fc::ripemd160 addr; }; inline bool operator == ( const address& a, const address& b ) { return a.addr == b.addr; }