From cd701761f9ad9919b9409e519237fb4c90f6375d Mon Sep 17 00:00:00 2001 From: gabime Date: Wed, 26 Aug 2020 00:10:05 +0300 Subject: [PATCH] clang-format --- CMakeLists.txt | 6 +-- bench/async_bench.cpp | 2 +- include/spdlog/details/fmt_helper.h | 6 +-- tests/CMakeLists.txt | 70 ++++++++++++++--------------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e189cf5c..fae09a30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,7 +192,8 @@ endif() # Misc definitions according to tweak options # --------------------------------------------------------------------------------------- set(SPDLOG_WCHAR_TO_UTF8_SUPPORT ${SPDLOG_WCHAR_SUPPORT}) -foreach(SPDLOG_OPTION +foreach( + SPDLOG_OPTION SPDLOG_WCHAR_TO_UTF8_SUPPORT SPDLOG_WCHAR_FILENAMES SPDLOG_NO_EXCEPTIONS @@ -200,8 +201,7 @@ foreach(SPDLOG_OPTION SPDLOG_PREVENT_CHILD_FD SPDLOG_NO_THREAD_ID SPDLOG_NO_TLS - SPDLOG_NO_ATOMIC_LEVELS -) + SPDLOG_NO_ATOMIC_LEVELS) if(${SPDLOG_OPTION}) target_compile_definitions(spdlog PUBLIC ${SPDLOG_OPTION}) target_compile_definitions(spdlog_header_only INTERFACE ${SPDLOG_OPTION}) diff --git a/bench/async_bench.cpp b/bench/async_bench.cpp index d9714687..d4167a47 100644 --- a/bench/async_bench.cpp +++ b/bench/async_bench.cpp @@ -29,7 +29,7 @@ void bench_mt(int howmany, std::shared_ptr log, int thread_count #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4996) // disable fopen warning under msvc -#endif // _MSC_VER +#endif // _MSC_VER int count_lines(const char *filename) { diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h index 4f363858..5dc311a0 100644 --- a/include/spdlog/details/fmt_helper.h +++ b/include/spdlog/details/fmt_helper.h @@ -38,11 +38,11 @@ inline unsigned int count_digits(T n) // fmt 7.0.0 renamed the internal namespace to detail. // See: https://github.com/fmtlib/fmt/issues/1538 #if FMT_VERSION < 70000 -internal + internal #else -detail + detail #endif -::count_digits(static_cast(n))); + ::count_digits(static_cast(n))); } inline void pad2(int n, memory_buf_t &dest) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fc97ea89..7a361ff1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,46 +1,46 @@ cmake_minimum_required(VERSION 3.10) project(spdlog_utests CXX) -if (NOT TARGET spdlog) +if(NOT TARGET spdlog) # Stand-alone build find_package(spdlog REQUIRED) -endif () +endif() include(../cmake/utils.cmake) find_package(PkgConfig) -if (PkgConfig_FOUND) +if(PkgConfig_FOUND) pkg_check_modules(systemd libsystemd) -endif () +endif() set(SPDLOG_UTESTS_SOURCES - test_file_helper.cpp - test_file_logging.cpp - test_daily_logger.cpp - test_misc.cpp - test_eventlog.cpp - test_pattern_formatter.cpp - test_async.cpp - test_registry.cpp - test_macros.cpp - utils.cpp - main.cpp - test_mpmc_q.cpp - test_dup_filter.cpp - test_fmt_helper.cpp - test_stdout_api.cpp - test_backtrace.cpp - test_create_dir.cpp - test_cfg.cpp - test_time_point.cpp) + test_file_helper.cpp + test_file_logging.cpp + test_daily_logger.cpp + test_misc.cpp + test_eventlog.cpp + test_pattern_formatter.cpp + test_async.cpp + test_registry.cpp + test_macros.cpp + utils.cpp + main.cpp + test_mpmc_q.cpp + test_dup_filter.cpp + test_fmt_helper.cpp + test_stdout_api.cpp + test_backtrace.cpp + test_create_dir.cpp + test_cfg.cpp + test_time_point.cpp) -if (NOT SPDLOG_NO_EXCEPTIONS) +if(NOT SPDLOG_NO_EXCEPTIONS) list(APPEND SPDLOG_UTESTS_SOURCES test_errors.cpp) -endif () +endif() -if (systemd_FOUND) +if(systemd_FOUND) list(APPEND SPDLOG_UTESTS_SOURCES test_systemd.cpp) -endif () +endif() enable_testing() @@ -48,22 +48,22 @@ function(spdlog_prepare_test test_target spdlog_lib) add_executable(${test_target} ${SPDLOG_UTESTS_SOURCES}) spdlog_enable_warnings(${test_target}) target_link_libraries(${test_target} PRIVATE ${spdlog_lib}) - if (systemd_FOUND) + if(systemd_FOUND) target_link_libraries(${test_target} PRIVATE ${systemd_LIBRARIES}) - endif () - if (SPDLOG_SANITIZE_ADDRESS) + endif() + if(SPDLOG_SANITIZE_ADDRESS) spdlog_enable_sanitizer(${test_target}) - endif () + endif() add_test(NAME ${test_target} COMMAND ${test_target}) set_tests_properties(${test_target} PROPERTIES RUN_SERIAL ON) endfunction() # The compiled library tests -if (SPDLOG_BUILD_TESTS OR SPDLOG_BUILD_ALL) +if(SPDLOG_BUILD_TESTS OR SPDLOG_BUILD_ALL) spdlog_prepare_test(spdlog-utests spdlog::spdlog) -endif () +endif() # The header-only library version tests -if (SPDLOG_BUILD_TESTS_HO OR SPDLOG_BUILD_ALL) +if(SPDLOG_BUILD_TESTS_HO OR SPDLOG_BUILD_ALL) spdlog_prepare_test(spdlog-utests-ho spdlog::spdlog_header_only) -endif () +endif()