From f452b5b8c1f711fa9afd043893ecc95c420d1f5a Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Mon, 3 Aug 2026 10:47:58 +1000 Subject: [PATCH] Prevent compiler warnings in the next ABI version --- src/main/cpp/multiprocessrollingfileappender.cpp | 3 +-- src/main/cpp/odbcappender.cpp | 4 ++-- src/main/cpp/outputdebugstringappender.cpp | 3 +-- src/test/cpp/net/socketappendertestcase.cpp | 2 +- src/test/cpp/rolling/manualrollingtest.cpp | 5 +---- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/cpp/multiprocessrollingfileappender.cpp b/src/main/cpp/multiprocessrollingfileappender.cpp index 2e54e1696..d024178da 100644 --- a/src/main/cpp/multiprocessrollingfileappender.cpp +++ b/src/main/cpp/multiprocessrollingfileappender.cpp @@ -82,10 +82,9 @@ struct MultiprocessRollingFileAppender::MultiprocessRollingFileAppenderPriv { if (basePolicy->getPatternConverterList().size()) { - Pool p; ObjectPtr obj = std::make_shared(apr_time_now()); LogString fileNamePattern; - (*(basePolicy->getPatternConverterList().begin()))->format(obj, fileNamePattern, p); + (*(basePolicy->getPatternConverterList().begin()))->format(obj, fileNamePattern); filePrefix.clear(); Transcoder::encode(fileNamePattern, filePrefix); } diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp index 22fd07cce..cb080e903 100644 --- a/src/main/cpp/odbcappender.cpp +++ b/src/main/cpp/odbcappender.cpp @@ -555,7 +555,7 @@ void ODBCAppender::ODBCAppenderPriv::setParameterValues(const spi::LoggingEventP else if (SQL_C_WCHAR == item.paramType) { LogString sbuf; - item.converter->format(event, sbuf, p); + item.converter->format(event, sbuf); #if LOG4CXX_LOGCHAR_IS_WCHAR std::wstring& tmp = sbuf; #else @@ -571,7 +571,7 @@ void ODBCAppender::ODBCAppenderPriv::setParameterValues(const spi::LoggingEventP else if (SQL_C_CHAR == item.paramType) { LogString sbuf; - item.converter->format(event, sbuf, p); + item.converter->format(event, sbuf); #if LOG4CXX_LOGCHAR_IS_UTF8 std::string& tmp = sbuf; #else diff --git a/src/main/cpp/outputdebugstringappender.cpp b/src/main/cpp/outputdebugstringappender.cpp index b4e9aa99e..bf862ae20 100644 --- a/src/main/cpp/outputdebugstringappender.cpp +++ b/src/main/cpp/outputdebugstringappender.cpp @@ -35,8 +35,7 @@ OutputDebugStringAppender::OutputDebugStringAppender() void OutputDebugStringAppender::append( LOG4CXX_APPEND_FORMAL_PARAMETERS ) { LogString buf; - Pool tempPool; - this->m_priv->layout->format(buf, event, tempPool); + this->m_priv->layout->format(buf, event); #if LOG4CXX_WCHAR_T_API LOG4CXX_ENCODE_WCHAR(wstr, buf); ::OutputDebugStringW(wstr.c_str()); diff --git a/src/test/cpp/net/socketappendertestcase.cpp b/src/test/cpp/net/socketappendertestcase.cpp index c52fe33af..10a00ef18 100644 --- a/src/test/cpp/net/socketappendertestcase.cpp +++ b/src/test/cpp/net/socketappendertestcase.cpp @@ -67,7 +67,7 @@ class SocketAppenderTestCase : public AppenderSkeletonTestCase LogManager::shutdown(); } - AppenderSkeleton* createAppenderSkeleton() const + AppenderSkeleton* createAppenderSkeleton() const override { return new log4cxx::net::SocketAppender(); } diff --git a/src/test/cpp/rolling/manualrollingtest.cpp b/src/test/cpp/rolling/manualrollingtest.cpp index 50bd6681a..692398560 100644 --- a/src/test/cpp/rolling/manualrollingtest.cpp +++ b/src/test/cpp/rolling/manualrollingtest.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -176,11 +175,9 @@ LOGUNIT_CLASS(ManualRollingTest) policy->setFileNamePattern(LOG4CXX_STR("%i")); policy->activateOptions(); - Pool pool; RolloverDescriptionPtr desc = policy->rollover( LOG4CXX_STR("output/manual-short-pattern-active.log"), - false, - pool); + false); LOGUNIT_ASSERT(desc != NULL); }