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

fix build errors and warnings

Browse source 
This commit was rebased by theoreticalbts and assigned issue #581
Conflict with 146c0c4d8e was resolved, minor improvements.
This commit is contained in:
Daniel Larimer 2016-02-15 16:01:13 -05:00 committed by theoreticalbts
parent e46af9f372
commit c63b624caf
3 changed files with 20 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/chain/include/graphene/chain/confidential_evaluator.hpp
View file

@ -26,9 +26,9 @@
namespace graphene { namespace chain { namespace graphene { namespace chain {
class transfer_to_blind_operation; struct transfer_to_blind_operation;
class transfer_from_blind_operation; struct transfer_from_blind_operation;
class blind_transfer_operation; struct blind_transfer_operation;
class transfer_to_blind_evaluator : public evaluator<transfer_to_blind_evaluator> class transfer_to_blind_evaluator : public evaluator<transfer_to_blind_evaluator>
{ {

6
libraries/chain/include/graphene/chain/market_evaluator.hpp
View file

@ -31,9 +31,9 @@ namespace graphene { namespace chain {
class asset_object; class asset_object;
class asset_bitasset_data_object; class asset_bitasset_data_object;
class call_order_object; class call_order_object;
class call_order_update_operation; struct call_order_update_operation;
class limit_order_cancel_operation; struct limit_order_cancel_operation;
class limit_order_create_operation; struct limit_order_create_operation;
class limit_order_create_evaluator : public evaluator<limit_order_create_evaluator> class limit_order_create_evaluator : public evaluator<limit_order_create_evaluator>
{ {

67
libraries/db/include/graphene/db/object_id.hpp
View file

@ -53,37 +53,22 @@ namespace graphene { namespace db {
bool is_null()const { return number == 0; } bool is_null()const { return number == 0; }
explicit operator uint64_t()const { return number; } explicit operator uint64_t()const { return number; }
friend bool operator == ( const object_id_type& a, const object_id_type& b ) friend bool operator == ( const object_id_type& a, const object_id_type& b ) { return a.number == b.number; }
{ friend bool operator != ( const object_id_type& a, const object_id_type& b ) { return a.number != b.number; }
return a.number == b.number; friend bool operator < ( const object_id_type& a, const object_id_type& b ) { return a.number < b.number; }
} friend bool operator > ( const object_id_type& a, const object_id_type& b ) { return a.number > b.number; }
friend bool operator != ( const object_id_type& a, const object_id_type& b )
{
return a.number != b.number;
}
object_id_type& operator++(int) { ++number; return *this; } object_id_type& operator++(int) { ++number; return *this; }
object_id_type& operator++() { ++number; return *this; } object_id_type& operator++() { ++number; return *this; }
friend object_id_type operator+(const object_id_type& a, int delta ) { friend object_id_type operator+(const object_id_type& a, int delta ) {
return object_id_type( a.space(), a.type(), a.instance() + delta ); return object_id_type( a.space(), a.type(), a.instance() + delta );
} }
friend object_id_type operator+(const object_id_type& a, int64_t delta ) { friend object_id_type operator+(const object_id_type& a, int64_t delta ) {
return object_id_type( a.space(), a.type(), a.instance() + delta ); return object_id_type( a.space(), a.type(), a.instance() + delta );
} }
friend size_t hash_value( object_id_type v ) { return std::hash<uint64_t>()(v.number); } friend size_t hash_value( object_id_type v ) { return std::hash<uint64_t>()(v.number); }
friend bool operator< ( const object_id_type& a, const object_id_type& b )
{
return a.number < b.number;
}
friend bool operator> ( const object_id_type& a, const object_id_type& b )
{
return a.number > b.number;
}
template< typename T > template< typename T >
bool is() const bool is() const
{ {
@ -134,40 +119,16 @@ namespace graphene { namespace db {
template<typename DB> template<typename DB>
const T& operator()(const DB& db)const { return db.get(*this); } const T& operator()(const DB& db)const { return db.get(*this); }
friend bool operator != ( const object_id& a, const object_id& b ) friend bool operator == ( const object_id& a, const object_id& b ) { return a.instance == b.instance; }
{ friend bool operator != ( const object_id& a, const object_id& b ) { return a.instance != b.instance; }
return a.instance != b.instance; friend bool operator == ( const object_id_type& a, const object_id& b ) { return a == object_id_type(b); }
} friend bool operator != ( const object_id_type& a, const object_id& b ) { return a != object_id_type(b); }
friend bool operator != ( const object_id_type& a, const object_id& b ) friend bool operator == ( const object_id& b, const object_id_type& a ) { return a == object_id_type(b); }
{ friend bool operator != ( const object_id& b, const object_id_type& a ) { return a != object_id_type(b); }
return a != object_id_type(b);
}
friend bool operator != ( const object_id& a, const object_id_type& b )
{
return object_id_type(a) != b;
}
friend bool operator < ( const object_id& a, const object_id& b ) { return a.instance.value < b.instance.value; }
friend bool operator > ( const object_id& a, const object_id& b ) { return a.instance.value > b.instance.value; }
friend bool operator == ( const object_id& a, const object_id& b )
{
return a.instance == b.instance;
}
friend bool operator == ( const object_id_type& a, const object_id& b )
{
return a == object_id_type(b);
}
friend bool operator == ( const object_id& b, const object_id_type& a )
{
return a == object_id_type(b);
}
friend bool operator < ( const object_id& a, const object_id& b )
{
return a.instance.value < b.instance.value;
}
friend bool operator > ( const object_id& a, const object_id& b )
{
return a.instance.value > b.instance.value;
}
friend size_t hash_value( object_id v ) { return std::hash<uint64_t>()(v.instance.value); } friend size_t hash_value( object_id v ) { return std::hash<uint64_t>()(v.instance.value); }
unsigned_int instance; unsigned_int instance;