This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/next_stable by this push:
new 4b18d6b8 Merge branch 'master' into next_stable
4b18d6b8 is described below
commit 4b18d6b8abd26b5b2449f081061387b2e39b0a1c
Author: Stephen Webb <[email protected]>
AuthorDate: Wed Nov 2 08:58:17 2022 +1100
Merge branch 'master' into next_stable
---
src/main/cpp/action.cpp | 1 +
src/main/cpp/threadutility.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/cpp/action.cpp b/src/main/cpp/action.cpp
index 35b1f4b0..6c37f0a1 100644
--- a/src/main/cpp/action.cpp
+++ b/src/main/cpp/action.cpp
@@ -18,6 +18,7 @@
#include <log4cxx/rolling/action.h>
#include <log4cxx/private/action_priv.h>
#include <mutex>
+#include <memory>
using namespace log4cxx;
using namespace log4cxx::rolling;
diff --git a/src/main/cpp/threadutility.cpp b/src/main/cpp/threadutility.cpp
index c311bba6..877b06ea 100644
--- a/src/main/cpp/threadutility.cpp
+++ b/src/main/cpp/threadutility.cpp
@@ -139,7 +139,7 @@ void ThreadUtility::threadStartedNameThread(LogString
threadName,
if (pthread_setname_np(static_cast<pthread_t>(nativeHandle),
sthreadName.c_str()) < 0) {
LOGLOG_ERROR(LOG4CXX_STR("unable to set thread name"));
}
-
+#elif LOG4CXX_HAS_SETTHREADDESCRIPTION
LOG4CXX_ENCODE_WCHAR(wthreadName, threadName);
HRESULT hr = SetThreadDescription(static_cast<HANDLE>(nativeHandle),
wthreadName.c_str());
if(FAILED(hr)){
