This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a commit to branch support_fmt_12 in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 516a983aa346920e552b27ee4ffd302533452093 Author: Stephen Webb <[email protected]> AuthorDate: Thu Jun 4 13:59:58 2026 +1000 Support for \{fmt} version 11 and 12 --- .github/workflows/log4cxx-windows.yml | 7 ++++--- src/main/include/log4cxx/helpers/asyncbuffer.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/log4cxx-windows.yml b/.github/workflows/log4cxx-windows.yml index cc7e2a14..2dfdab7f 100644 --- a/.github/workflows/log4cxx-windows.yml +++ b/.github/workflows/log4cxx-windows.yml @@ -33,10 +33,11 @@ jobs: os: windows-2025 qt: OFF next_abi: ON + vcpkg_options: fmt - name: windows-2025-qt os: windows-2025 qt: ON - qt_component: qtbase + vcpkg_options: qtbase next_abi: OFF steps: @@ -58,7 +59,7 @@ jobs: with: repository: microsoft/vcpkg path: vcpkg - ref: 2025.07.25 + ref: 2026.05.25 - name: 'Configure Dependencies' if: steps.restore-vcpkg-cache.outputs.cache-hit != 'true' @@ -67,7 +68,7 @@ jobs: run: | cd vcpkg ./bootstrap-vcpkg.bat - ./vcpkg install apr apr-util fmt ${{ matrix.qt_component }} --triplet=x64-windows + ./vcpkg install apr apr-util ${{ matrix.vcpkg_options }} --triplet=x64-windows - name: 'Install zip' id: install-zip diff --git a/src/main/include/log4cxx/helpers/asyncbuffer.h b/src/main/include/log4cxx/helpers/asyncbuffer.h index 5639f906..7d692b21 100644 --- a/src/main/include/log4cxx/helpers/asyncbuffer.h +++ b/src/main/include/log4cxx/helpers/asyncbuffer.h @@ -204,7 +204,7 @@ public: // Modifiers { auto store = FmtArgStore(); ( store.push_back(std::forward<Args>(args)), ...); - initializeForFmt(std::move(fmt_str), std::move(store)); + initializeForFmt(fmt_str.get(), std::move(store)); } #if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR @@ -215,7 +215,7 @@ public: // Modifiers { auto store = WideFmtArgStore(); ( store.push_back(std::forward<Args>(args)), ...); - initializeForFmt(std::move(fmt_str), std::move(store)); + initializeForFmt(fmt_str.get(), std::move(store)); } #endif // LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR #endif // LOG4CXX_ASYNC_BUFFER_SUPPORTS_FMT
