Merge pull request #2601

4d35ad76 Fix compiler warnings with Clang 6.0.0. (Vasil Dimov)

src/blockchain_utilities/blockchain_export.cpp

@@ -178,7 +178,7 @@ int main(int argc, char* argv[])
   }
   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("Exporting blockchain raw data...");
 
@@ -192,7 +192,7 @@ int main(int argc, char* argv[])
     BootstrapFile bootstrap;
     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");
   return 0;
 

src/cryptonote_protocol/cryptonote_protocol_handler.inl

@@ -1632,7 +1632,7 @@ skip:
 
     // sort peers between fluffy ones and others
     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)
       {

src/wallet/wallet_rpc_server.cpp

@@ -2033,7 +2033,7 @@ just_dir:
   if (wal) wrpc.set_wallet(wal.release());
   bool r = wrpc.init(&(vm.get()));
   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();
   });
   LOG_PRINT_L0(tools::wallet_rpc_server::tr("Starting wallet rpc server"));