Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Try to fix some version-specific clangformat formatting issues (#1927)

Browse source
This commit is contained in:
cryptocode 2019-04-25 23:42:17 +02:00 • committed by GitHub
commit 0f6d02c4ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nano/nano_node/daemon.cpp
View file

@ -75,11 +75,13 @@ void nano_daemon::daemon::run (boost::filesystem::path const & data_path, nano::
rpc_process = std::make_unique<boost::process::child> (config.rpc.rpc_path, "--daemon");
#else
auto rpc_exe_command = boost::str (boost::format ("%1% %2%") % config.rpc.rpc_path % "--daemon");
rpc_process_thread = std::make_unique<std::thread> ([ rpc_exe_command, &logger = node->logger ]() {
// clang-format off
rpc_process_thread = std::make_unique<std::thread> ([rpc_exe_command, &logger = node->logger]() {
nano::thread_role::set (nano::thread_role::name::rpc_process_container);
std::system (rpc_exe_command.c_str ());
logger.always_log ("RPC server has stopped");
});
// clang-format on
#endif
}
}

5
nano/node/testing.cpp
View file

@ -77,11 +77,10 @@ nano::system::~system ()
i->stop ();
}
// clang-format off
#ifndef _WIN32
// Windows cannot remove the log and data files while they are still owned by this process.
// They will be removed later
// clang-format on
#ifndef _WIN32
// Clean up tmp directories created by the tests. Since it's sometimes useful to
// see log files after test failures, an environment variable is supported to
// retain the files.