diff --git a/.gitignore b/.gitignore index 1a84b559..e319850e 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ object_database/* .vscode .DS_Store .idea +/.cache/clangd/* diff --git a/libraries/db/include/graphene/db/index.hpp b/libraries/db/include/graphene/db/index.hpp index 1bc593f4..5992172d 100644 --- a/libraries/db/include/graphene/db/index.hpp +++ b/libraries/db/include/graphene/db/index.hpp @@ -277,7 +277,7 @@ namespace graphene { namespace db { { static_assert( object_id::space_id == Object::space_id, "Space ID mismatch!" ); static_assert( object_id::type_id == Object::type_id, "Type_ID mismatch!" ); - if( id.instance >= next ) return nullptr; + if( (const unsigned long) id.instance >= next ) return nullptr; return content[id.instance.value >> chunkbits][id.instance.value & _mask]; }; diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/bitcoin_address.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/bitcoin_address.hpp index b9467e2f..1e74c050 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/bitcoin_address.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/bitcoin_address.hpp @@ -217,6 +217,7 @@ public: private: void create_redeem_script(const fc::ecc::public_key &user_key_data, const std::vector> &keys_data); +public: uint32_t latency_; }; diff --git a/tests/tests/database_tests.cpp b/tests/tests/database_tests.cpp index e0644b1b..a9e9a6e4 100644 --- a/tests/tests/database_tests.cpp +++ b/tests/tests/database_tests.cpp @@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE( flat_index_test ) price_feed current_feed; current_feed.settlement_price = bitusd.amount(100) / asset(100); publish_feed(bitusd, sam, current_feed); - FC_ASSERT( bitusd.bitasset_data_id->instance == 0 ); + FC_ASSERT( bitusd.bitasset_data_id->instance == (const fc::unsigned_int) 0 ); FC_ASSERT( !(*bitusd.bitasset_data_id)(db).current_feed.settlement_price.is_null() ); try { auto ses = db._undo_db.start_undo_session();