rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-12-23 05:37:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2601

Browse source 
4d35ad76 Fix compiler warnings with Clang 6.0.0. (Vasil Dimov)
This commit is contained in:
Riccardo Spagni 2017-10-15 21:36:36 +02:00
commit 8d511f3c24
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/blockchain_utilities/blockchain_export.cpp
View file

@ -178,7 +178,7 @@ int main(int argc, char* argv[])
} }
r = core_storage->init(db, opt_testnet); r = core_storage->init(db, opt_testnet);
CHECK_AND_ASSERT_MES(r, false, "Failed to initialize source blockchain storage"); CHECK_AND_ASSERT_MES(r, 1, "Failed to initialize source blockchain storage");
LOG_PRINT_L0("Source blockchain storage initialized OK"); LOG_PRINT_L0("Source blockchain storage initialized OK");
LOG_PRINT_L0("Exporting blockchain raw data..."); LOG_PRINT_L0("Exporting blockchain raw data...");
@ -192,7 +192,7 @@ int main(int argc, char* argv[])
BootstrapFile bootstrap; BootstrapFile bootstrap;
r = bootstrap.store_blockchain_raw(core_storage, NULL, output_file_path, block_stop); r = bootstrap.store_blockchain_raw(core_storage, NULL, output_file_path, block_stop);
} }
CHECK_AND_ASSERT_MES(r, false, "Failed to export blockchain raw data"); CHECK_AND_ASSERT_MES(r, 1, "Failed to export blockchain raw data");
LOG_PRINT_L0("Blockchain raw data exported OK"); LOG_PRINT_L0("Blockchain raw data exported OK");
return 0; return 0;

2
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file

@ -1632,7 +1632,7 @@ skip:
// sort peers between fluffy ones and others // sort peers between fluffy ones and others
std::list<boost::uuids::uuid> fullConnections, fluffyConnections; std::list<boost::uuids::uuid> fullConnections, fluffyConnections;
m_p2p->for_each_connection([this, &arg, &fluffy_arg, &exclude_context, &fullConnections, &fluffyConnections](connection_context& context, nodetool::peerid_type peer_id, uint32_t support_flags) m_p2p->for_each_connection([this, &exclude_context, &fullConnections, &fluffyConnections](connection_context& context, nodetool::peerid_type peer_id, uint32_t support_flags)
{ {
if (peer_id && exclude_context.m_connection_id != context.m_connection_id) if (peer_id && exclude_context.m_connection_id != context.m_connection_id)
{ {

2
src/wallet/wallet_rpc_server.cpp
View file

@ -2033,7 +2033,7 @@ just_dir:
if (wal) wrpc.set_wallet(wal.release()); if (wal) wrpc.set_wallet(wal.release());
bool r = wrpc.init(&(vm.get())); bool r = wrpc.init(&(vm.get()));
CHECK_AND_ASSERT_MES(r, 1, tools::wallet_rpc_server::tr("Failed to initialize wallet rpc server")); CHECK_AND_ASSERT_MES(r, 1, tools::wallet_rpc_server::tr("Failed to initialize wallet rpc server"));
tools::signal_handler::install([&wrpc, &wal](int) { tools::signal_handler::install([&wrpc](int) {
wrpc.send_stop_signal(); wrpc.send_stop_signal();
}); });
LOG_PRINT_L0(tools::wallet_rpc_server::tr("Starting wallet rpc server")); LOG_PRINT_L0(tools::wallet_rpc_server::tr("Starting wallet rpc server"));