From 42d1f40a185c92d8ffbfa9293c346507cb602a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SCC/=E6=A5=8A=E5=BF=97=E7=92=BF?= Date: Thu, 23 Mar 2023 16:24:48 +0800 Subject: [PATCH] Fix stdout_sink_base::log's behavior inconsistency (#2646) * Fix stdout_sink_base::log's behavior inconsistency It will flush every time when it if not defined _WIN32, but not in Windows family. We viewed the commit #48d4ed9 for fixing issue #1675 . It seems missing this flushing operation in mistake. * Use fflush at all operating system * Remove redundant fflush from stdout_sink_base --------- Co-authored-by: scc --- include/spdlog/sinks/stdout_sinks-inl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/spdlog/sinks/stdout_sinks-inl.h b/include/spdlog/sinks/stdout_sinks-inl.h index 756734bf..9e8e6ddf 100644 --- a/include/spdlog/sinks/stdout_sinks-inl.h +++ b/include/spdlog/sinks/stdout_sinks-inl.h @@ -60,7 +60,6 @@ SPDLOG_INLINE void stdout_sink_base::log(const details::log_msg &m std::lock_guard lock(mutex_); memory_buf_t formatted; formatter_->format(msg, formatted); - ::fflush(file_); // flush in case there is something in this file_ already auto size = static_cast(formatted.size()); DWORD bytes_written = 0; bool ok = ::WriteFile(handle_, formatted.data(), size, &bytes_written, nullptr) != 0; @@ -73,8 +72,8 @@ SPDLOG_INLINE void stdout_sink_base::log(const details::log_msg &m memory_buf_t formatted; formatter_->format(msg, formatted); ::fwrite(formatted.data(), sizeof(char), formatted.size(), file_); - ::fflush(file_); // flush every line to terminal #endif // WIN32 + ::fflush(file_); // flush every line to terminal } template