Skip to content

Commit fe20e45

Browse files
authored
Prevent compiler warnings in the next ABI version (#728)
1 parent eb835f9 commit fe20e45

5 files changed

Lines changed: 6 additions & 11 deletions

File tree

src/main/cpp/multiprocessrollingfileappender.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,9 @@ struct MultiprocessRollingFileAppender::MultiprocessRollingFileAppenderPriv
8282
{
8383
if (basePolicy->getPatternConverterList().size())
8484
{
85-
Pool p;
8685
ObjectPtr obj = std::make_shared<Date>(apr_time_now());
8786
LogString fileNamePattern;
88-
(*(basePolicy->getPatternConverterList().begin()))->format(obj, fileNamePattern, p);
87+
(*(basePolicy->getPatternConverterList().begin()))->format(obj, fileNamePattern);
8988
filePrefix.clear();
9089
Transcoder::encode(fileNamePattern, filePrefix);
9190
}

src/main/cpp/odbcappender.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ void ODBCAppender::ODBCAppenderPriv::setParameterValues(const spi::LoggingEventP
555555
else if (SQL_C_WCHAR == item.paramType)
556556
{
557557
LogString sbuf;
558-
item.converter->format(event, sbuf, p);
558+
item.converter->format(event, sbuf);
559559
#if LOG4CXX_LOGCHAR_IS_WCHAR
560560
std::wstring& tmp = sbuf;
561561
#else
@@ -571,7 +571,7 @@ void ODBCAppender::ODBCAppenderPriv::setParameterValues(const spi::LoggingEventP
571571
else if (SQL_C_CHAR == item.paramType)
572572
{
573573
LogString sbuf;
574-
item.converter->format(event, sbuf, p);
574+
item.converter->format(event, sbuf);
575575
#if LOG4CXX_LOGCHAR_IS_UTF8
576576
std::string& tmp = sbuf;
577577
#else

src/main/cpp/outputdebugstringappender.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ OutputDebugStringAppender::OutputDebugStringAppender()
3535
void OutputDebugStringAppender::append( LOG4CXX_APPEND_FORMAL_PARAMETERS )
3636
{
3737
LogString buf;
38-
Pool tempPool;
39-
this->m_priv->layout->format(buf, event, tempPool);
38+
this->m_priv->layout->format(buf, event);
4039
#if LOG4CXX_WCHAR_T_API
4140
LOG4CXX_ENCODE_WCHAR(wstr, buf);
4241
::OutputDebugStringW(wstr.c_str());

src/test/cpp/net/socketappendertestcase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class SocketAppenderTestCase : public AppenderSkeletonTestCase
6767
LogManager::shutdown();
6868
}
6969

70-
AppenderSkeleton* createAppenderSkeleton() const
70+
AppenderSkeleton* createAppenderSkeleton() const override
7171
{
7272
return new log4cxx::net::SocketAppender();
7373
}

src/test/cpp/rolling/manualrollingtest.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <log4cxx/rolling/fixedwindowrollingpolicy.h>
2525
#include <log4cxx/rolling/sizebasedtriggeringpolicy.h>
2626
#include <log4cxx/filter/levelrangefilter.h>
27-
#include <log4cxx/helpers/pool.h>
2827
#include <log4cxx/logger.h>
2928
#include <log4cxx/propertyconfigurator.h>
3029
#include <log4cxx/rolling/rollingfileappender.h>
@@ -176,11 +175,9 @@ LOGUNIT_CLASS(ManualRollingTest)
176175
policy->setFileNamePattern(LOG4CXX_STR("%i"));
177176
policy->activateOptions();
178177

179-
Pool pool;
180178
RolloverDescriptionPtr desc = policy->rollover(
181179
LOG4CXX_STR("output/manual-short-pattern-active.log"),
182-
false,
183-
pool);
180+
false);
184181

185182
LOGUNIT_ASSERT(desc != NULL);
186183
}

0 commit comments

Comments
 (0)