gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
gabime
2019-06-14 00:23:51 +03:00
parent c09dee7717
commit db5af8ead1
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bench/async_bench.cpp
View File

@@ -26,11 +26,10 @@ using namespace utils;
void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count); void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count);
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4996) //disable fopen warning under msvc #pragma warning(disable : 4996) // disable fopen warning under msvc
#endif // _MSC_VER #endif // _MSC_VER
int count_lines(const char *filename) int count_lines(const char *filename)
{ {
@@ -59,7 +58,7 @@ void verify_file(const char *filename, int expected_count)
} }
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif #endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@@ -130,7 +129,8 @@ int main(int argc, char *argv[])
{ {
auto tp = std::make_shared<details::thread_pool>(queue_size, 1); auto tp = std::make_shared<details::thread_pool>(queue_size, 1);
auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true); auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true);
auto logger = std::make_shared<async_logger>("async_logger", std::move(file_sink), std::move(tp), async_overflow_policy::overrun_oldest); auto logger =
std::make_shared<async_logger>("async_logger", std::move(file_sink), std::move(tp), async_overflow_policy::overrun_oldest);
bench_mt(howmany, std::move(logger), threads); bench_mt(howmany, std::move(logger), threads);
} }
spdlog::shutdown(); spdlog::shutdown();

4
include/spdlog/details/pattern_formatter-inl.h
View File

@@ -828,10 +828,10 @@ public:
: flag_formatter(padinfo) : flag_formatter(padinfo)
{} {}
static const char* basename(const char* filename) static const char *basename(const char *filename)
{ {
const char *rv = std::strrchr(filename, os::folder_sep); const char *rv = std::strrchr(filename, os::folder_sep);
return rv != nullptr ? rv + 1: filename; return rv != nullptr ? rv + 1 : filename;
} }
void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override

2
include/spdlog/spdlog.h
View File

@@ -267,7 +267,7 @@ inline void critical(const wchar_t *fmt, const Args &... args)
do \ do \
{ \ { \
if (logger->should_log(level)) \ if (logger->should_log(level)) \
logger->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); \ logger->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); \
} while (0) } while (0)
#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE

1
tests/test_pattern_formatter.cpp
View File

@@ -301,4 +301,3 @@ TEST_CASE("full filename formatter", "[pattern_formatter]")
formatter.format(msg, formatted); formatter.format(msg, formatted);
REQUIRE(fmt::to_string(formatted) == "/a/b/c/d/myfile.cpp:123"); REQUIRE(fmt::to_string(formatted) == "/a/b/c/d/myfile.cpp:123");
} }