From 96403787f7127ee3d40732f54d3cff090cabfa11 Mon Sep 17 00:00:00 2001 From: gabime Date: Sun, 24 Sep 2023 20:48:58 +0300 Subject: [PATCH] Updated format.sh script --- scripts/format.sh | 5 +++-- src/fmt/bundled_fmtlib_format.cpp | 29 ++++++++++++----------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/scripts/format.sh b/scripts/format.sh index bd5868eb..2ae292ff 100755 --- a/scripts/format.sh +++ b/scripts/format.sh @@ -6,10 +6,11 @@ echo -n "Running dos2unix " find . -name "*\.h" -o -name "*\.cpp"|grep -v bundled|xargs -I {} sh -c "dos2unix '{}' 2>/dev/null; echo -n '.'" echo echo -n "Running clang-format " -find . -name "*\.h" -o -name "*\.cpp"|grep -v bundled|xargs -I {} sh -c "clang-format -i {}; echo -n '.'" +find include -name "*\.h" |grep -v bundled|xargs -I {} sh -c "clang-format -i {}; echo -n '.'" +find src -name "*\.cpp"|xargs -I {} sh -c "clang-format -i {}; echo -n '.'" echo echo -n "Running cmake-format " -find . -name "CMakeLists.txt" -o -name "*\.cmake"|grep -v bundled|xargs -I {} sh -c "cmake-format --line-width 120 --tab-size 4 --max-subgroups-hwrap 4 -i {}; echo -n '.'" +find . -name "CMakeLists.txt" -o -name "*\.cmake"|grep -v bundled|grep -v build|xargs -I {} sh -c "cmake-format --line-width 120 --tab-size 4 --max-subgroups-hwrap 4 -i {}; echo -n '.'" echo diff --git a/src/fmt/bundled_fmtlib_format.cpp b/src/fmt/bundled_fmtlib_format.cpp index 501330c6..f8fb6b3f 100644 --- a/src/fmt/bundled_fmtlib_format.cpp +++ b/src/fmt/bundled_fmtlib_format.cpp @@ -4,40 +4,35 @@ #if !defined(SPDLOG_FMT_EXTERNAL) && !defined(SPDLOG_USE_STD_FORMAT) -#include +# include FMT_BEGIN_NAMESPACE namespace detail { -template FMT_API auto dragonbox::to_decimal(float x) noexcept - -> dragonbox::decimal_fp; -template FMT_API auto dragonbox::to_decimal(double x) noexcept - -> dragonbox::decimal_fp; +template FMT_API auto dragonbox::to_decimal(float x) noexcept -> dragonbox::decimal_fp; +template FMT_API auto dragonbox::to_decimal(double x) noexcept -> dragonbox::decimal_fp; -#ifndef FMT_STATIC_THOUSANDS_SEPARATOR -template FMT_API locale_ref::locale_ref(const std::locale& loc); +# ifndef FMT_STATIC_THOUSANDS_SEPARATOR +template FMT_API locale_ref::locale_ref(const std::locale &loc); template FMT_API auto locale_ref::get() const -> std::locale; -#endif +# endif // Explicit instantiations for char. -template FMT_API auto thousands_sep_impl(locale_ref) - -> thousands_sep_result; +template FMT_API auto thousands_sep_impl(locale_ref) -> thousands_sep_result; template FMT_API auto decimal_point_impl(locale_ref) -> char; -template FMT_API void buffer::append(const char*, const char*); +template FMT_API void buffer::append(const char *, const char *); -template FMT_API void vformat_to(buffer&, string_view, - typename vformat_args<>::type, locale_ref); +template FMT_API void vformat_to(buffer &, string_view, typename vformat_args<>::type, locale_ref); // Explicit instantiations for wchar_t. -template FMT_API auto thousands_sep_impl(locale_ref) - -> thousands_sep_result; +template FMT_API auto thousands_sep_impl(locale_ref) -> thousands_sep_result; template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t; -template FMT_API void buffer::append(const wchar_t*, const wchar_t*); +template FMT_API void buffer::append(const wchar_t *, const wchar_t *); -} // namespace detail +} // namespace detail FMT_END_NAMESPACE #endif // !SPDLOG_FMT_EXTERNAL