Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/cpp/multiprocessrollingfileappender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@ struct MultiprocessRollingFileAppender::MultiprocessRollingFileAppenderPriv
{
if (basePolicy->getPatternConverterList().size())
{
Pool p;
ObjectPtr obj = std::make_shared<Date>(apr_time_now());
LogString fileNamePattern;
(*(basePolicy->getPatternConverterList().begin()))->format(obj, fileNamePattern, p);
(*(basePolicy->getPatternConverterList().begin()))->format(obj, fileNamePattern);
filePrefix.clear();
Transcoder::encode(fileNamePattern, filePrefix);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/cpp/odbcappender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/main/cpp/outputdebugstringappender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion src/test/cpp/net/socketappendertestcase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class SocketAppenderTestCase : public AppenderSkeletonTestCase
LogManager::shutdown();
}

AppenderSkeleton* createAppenderSkeleton() const
AppenderSkeleton* createAppenderSkeleton() const override
{
return new log4cxx::net::SocketAppender();
}
Expand Down
5 changes: 1 addition & 4 deletions src/test/cpp/rolling/manualrollingtest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <log4cxx/rolling/fixedwindowrollingpolicy.h>
#include <log4cxx/rolling/sizebasedtriggeringpolicy.h>
#include <log4cxx/filter/levelrangefilter.h>
#include <log4cxx/helpers/pool.h>
#include <log4cxx/logger.h>
#include <log4cxx/propertyconfigurator.h>
#include <log4cxx/rolling/rollingfileappender.h>
Expand Down Expand Up @@ -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);
}
Expand Down
Loading