You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2018/08/28 12:12:53 UTC
[1/2] logging-log4cxx git commit: Fixed build when std::atomic is not
available
Repository: logging-log4cxx
Updated Branches:
refs/heads/LOGCXX-500 c9eb1e7fe -> 98141e50d
Fixed build when std::atomic is not available
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/23f1d35d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/23f1d35d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/23f1d35d
Branch: refs/heads/LOGCXX-500
Commit: 23f1d35d377e77392a8b81f3274d3e2dc09e79c3
Parents: 72701c8
Author: Denys Smolianiuk <de...@harmonicinc.com>
Authored: Tue Aug 28 11:36:31 2018 +0300
Committer: Denys Smolianiuk <de...@harmonicinc.com>
Committed: Tue Aug 28 11:36:31 2018 +0300
----------------------------------------------------------------------
src/main/include/log4cxx/helpers/mutex.h | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/23f1d35d/src/main/include/log4cxx/helpers/mutex.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/mutex.h b/src/main/include/log4cxx/helpers/mutex.h
index aecc6bd..e4b0411 100644
--- a/src/main/include/log4cxx/helpers/mutex.h
+++ b/src/main/include/log4cxx/helpers/mutex.h
@@ -22,7 +22,9 @@
#include <apr_portable.h>
+#if defined(RW_MUTEX)
#include <atomic>
+#endif
extern "C" {
struct apr_thread_mutex_t;
[2/2] logging-log4cxx git commit: Merge branch 'LOGCXX-500' of
https://github.com/apache/logging-log4cxx into LOGCXX-500
Posted by ts...@apache.org.
Merge branch 'LOGCXX-500' of https://github.com/apache/logging-log4cxx into LOGCXX-500
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/98141e50
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/98141e50
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/98141e50
Branch: refs/heads/LOGCXX-500
Commit: 98141e50dd0f4ece561c79cc9b3f11320ce4731d
Parents: 23f1d35 c9eb1e7
Author: Denys Smolianiuk <de...@harmonicinc.com>
Authored: Tue Aug 28 11:43:08 2018 +0300
Committer: Denys Smolianiuk <de...@harmonicinc.com>
Committed: Tue Aug 28 11:43:08 2018 +0300
----------------------------------------------------------------------
src/changes/changes.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------