Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 25, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion nano/nano_node/daemon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
5 changes: 2 additions & 3 deletions nano/node/testing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down