[logging-log4cxx] branch LOGCXX-510 updated: Some compile time errors with VS Community 2019.

[ts...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tschoening pushed a commit to branch LOGCXX-510
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


The following commit(s) were added to refs/heads/LOGCXX-510 by this push:
     new af4c7a7  Some compile time errors with VS Community 2019.
af4c7a7 is described below

commit af4c7a7333d14dcbc97d6305abca2246cc781158
Author: Thorsten Schöning <ts...@am-soft.de>
AuthorDate: Tue Nov 9 11:12:38 2021 +0100

    Some compile time errors with VS Community 2019.
---
 src/main/cpp/nteventlogappender.cpp         | 9 +++++----
 src/main/cpp/outputdebugstringappender.cpp  | 3 ++-
 src/main/cpp/smtpappender.cpp               | 2 +-
 src/test/cpp/net/telnetappendertestcase.cpp | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/cpp/nteventlogappender.cpp b/src/main/cpp/nteventlogappender.cpp
index cce5f91..6ac9da2 100644
--- a/src/main/cpp/nteventlogappender.cpp
+++ b/src/main/cpp/nteventlogappender.cpp
@@ -26,6 +26,7 @@
 #include <log4cxx/helpers/stringhelper.h>
 #include <log4cxx/helpers/transcoder.h>
 #include <log4cxx/helpers/pool.h>
+#include <log4cxx/private/appenderskeleton_priv.h>
 
 using namespace log4cxx;
 using namespace log4cxx::spi;
@@ -95,9 +96,9 @@ NTEventLogAppender::NTEventLogAppender() : hEventLog(NULL), pCurrentUserSID(NULL
 }
 
 NTEventLogAppender::NTEventLogAppender(const LogString& server, const LogString& log, const LogString& source, const LayoutPtr& layout)
-	: server(server), log(log), source(source), hEventLog(NULL), pCurrentUserSID(NULL)
+	:	AppenderSkeleton(std::make_unique<AppenderSkeletonPrivate>(layout)),
+		server(server), log(log), source(source), hEventLog(NULL), pCurrentUserSID(NULL)
 {
-	this->layout = layout;
 	Pool pool;
 	activateOptions(pool);
 }
@@ -149,7 +150,7 @@ void NTEventLogAppender::activateOptions(Pool&)
 	{
 		LogLog::warn(
 			((LogString) LOG4CXX_STR("Source option not set for appender ["))
-			+ name + LOG4CXX_STR("]."));
+			+ this->m_priv->name + LOG4CXX_STR("]."));
 		return;
 	}
 
@@ -191,7 +192,7 @@ void NTEventLogAppender::append(const LoggingEventPtr& event, Pool& p)
 	}
 
 	LogString oss;
-	layout->format(oss, event, p);
+	this->m_priv->layout->format(oss, event, p);
 	wchar_t* msgs = Transcoder::wencode(oss, p);
 	BOOL bSuccess = ::ReportEventW(
 			hEventLog,
diff --git a/src/main/cpp/outputdebugstringappender.cpp b/src/main/cpp/outputdebugstringappender.cpp
index a394b8a..0673ee0 100644
--- a/src/main/cpp/outputdebugstringappender.cpp
+++ b/src/main/cpp/outputdebugstringappender.cpp
@@ -18,6 +18,7 @@
 #if defined(_WIN32)
 #include <log4cxx/nt/outputdebugstringappender.h>
 #include <log4cxx/helpers/transcoder.h>
+#include <log4cxx/private/appenderskeleton_priv.h>
 
 #include "windows.h"
 
@@ -34,7 +35,7 @@ OutputDebugStringAppender::OutputDebugStringAppender()
 void OutputDebugStringAppender::append(const spi::LoggingEventPtr& event, Pool& p)
 {
 	LogString buf;
-	layout->format(buf, event, p);
+	this->m_priv->layout->format(buf, event, p);
 #if LOG4CXX_WCHAR_T_API
 	LOG4CXX_ENCODE_WCHAR(wstr, buf);
 	::OutputDebugStringW(wstr.c_str());
diff --git a/src/main/cpp/smtpappender.cpp b/src/main/cpp/smtpappender.cpp
index 64c3c3b..42cd6ed 100644
--- a/src/main/cpp/smtpappender.cpp
+++ b/src/main/cpp/smtpappender.cpp
@@ -823,5 +823,5 @@ void SMTPAppender::setEvaluatorClass(const LogString& value)
 
 int SMTPAppender::getBufferSize() const
 {
-
+	return _priv->bufferSize;
 }
diff --git a/src/test/cpp/net/telnetappendertestcase.cpp b/src/test/cpp/net/telnetappendertestcase.cpp
index 0ca1caf..7482f95 100644
--- a/src/test/cpp/net/telnetappendertestcase.cpp
+++ b/src/test/cpp/net/telnetappendertestcase.cpp
@@ -48,7 +48,7 @@ class TelnetAppenderTestCase : public AppenderSkeletonTestCase
 		static LayoutPtr createLayout()
 		{
 			PatternLayoutPtr pl = std::make_shared<PatternLayout>();
-			pl->setConversionPattern( "%r [%t] %-5p - %m%n" );
+			pl->setConversionPattern( LOG4CXX_STR("%r [%t] %-5p - %m%n") );
 			return pl;
 		}