From 0f6d02c4ba1498ccd302776b40cd3d79f34b947e Mon Sep 17 00:00:00 2001 From: cryptocode Date: Thu, 25 Apr 2019 23:42:17 +0200 Subject: [PATCH] Try to fix some version-specific clangformat formatting issues (#1927) --- nano/nano_node/daemon.cpp | 4 +++- nano/node/testing.cpp | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nano/nano_node/daemon.cpp b/nano/nano_node/daemon.cpp index dabc357c..3e666ccf 100644 --- a/nano/nano_node/daemon.cpp +++ b/nano/nano_node/daemon.cpp @@ -75,11 +75,13 @@ void nano_daemon::daemon::run (boost::filesystem::path const & data_path, nano:: rpc_process = std::make_unique (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 ([ rpc_exe_command, &logger = node->logger ]() { + // clang-format off + rpc_process_thread = std::make_unique ([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 } } diff --git a/nano/node/testing.cpp b/nano/node/testing.cpp index 2ecc4bb2..4529faa5 100644 --- a/nano/node/testing.cpp +++ b/nano/node/testing.cpp @@ -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.