You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2021/08/21 03:45:58 UTC
[logging-log4cxx] 03/04: setname actually tests properly
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch LOGCXX-431
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 46ad073499f147d0b3d46e8f8f0a4dc033b12738
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Fri Aug 20 23:42:18 2021 -0400
setname actually tests properly
---
src/main/include/CMakeLists.txt | 6 +++---
src/main/include/log4cxx/helpers/threadutility.h | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt
index 9905434..ce3b4e8 100644
--- a/src/main/include/CMakeLists.txt
+++ b/src/main/include/CMakeLists.txt
@@ -95,9 +95,9 @@ if(UNIX)
# Since this is really not a core feature and the end-user can configure
# it anyway, we're only going to worry about linux.
include(${LOG4CXX_SOURCE_DIR}/src/cmake/pthread/log4cxx-pthread.cmake)
- set(HAS_PTHREAD_SETNAME ${PTHREAD_SETNAME_NP_FOUND})
-
- message("setname np: ${PTHREAD_SETNAME_NP_FOUND}")
+ if(${PTHREAD_SETNAME_NP_FOUND})
+ set(HAS_PTHREAD_SETNAME 1)
+ endif()
endif(UNIX)
if(WIN32)
diff --git a/src/main/include/log4cxx/helpers/threadutility.h b/src/main/include/log4cxx/helpers/threadutility.h
index 4111a0d..246e284 100644
--- a/src/main/include/log4cxx/helpers/threadutility.h
+++ b/src/main/include/log4cxx/helpers/threadutility.h
@@ -56,9 +56,8 @@ public:
/**
* Configure the thread functions that log4cxx will use.
- * Note that setting any of these parameters to nullptr will cause the
- * default function to be used.
- *
+ * Note that setting any of these parameters to nullptr is valid,
+ * and simply results in the callback not being called. *
*/
void configureThreadFunctions( pre_thread_start pre_start,
thread_started started,