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/20 06:48:27 UTC
[1/2] logging-log4cxx git commit: LOGCXX-500: Codestyle to improve
merging.
Repository: logging-log4cxx
Updated Branches:
refs/heads/LOGCXX-500 9f75f7f06 -> 65ebfef68
LOGCXX-500: Codestyle to improve merging.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/e3188379
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/e3188379
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/e3188379
Branch: refs/heads/LOGCXX-500
Commit: e3188379687e5032f26bf4924a6c93b8ed81d0ef
Parents: 2fe5572
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Mon Aug 20 08:29:58 2018 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Mon Aug 20 08:29:58 2018 +0200
----------------------------------------------------------------------
src/main/cpp/mutex.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/e3188379/src/main/cpp/mutex.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/mutex.cpp b/src/main/cpp/mutex.cpp
index c50a562..3ee29dd 100644
--- a/src/main/cpp/mutex.cpp
+++ b/src/main/cpp/mutex.cpp
@@ -16,10 +16,10 @@
*/
#include <log4cxx/logstring.h>
-#include <log4cxx/helpers/mutex.h>
#include <log4cxx/helpers/exception.h>
-#include <apr_thread_mutex.h>
+#include <log4cxx/helpers/mutex.h>
#include <log4cxx/helpers/pool.h>
+#include <apr_thread_mutex.h>
#include <assert.h>
#if !defined(LOG4CXX)
#define LOG4CXX 1
[2/2] logging-log4cxx git commit: LOGCXX-500: Merge branch 'master'
into LOGCXX-500
Posted by ts...@apache.org.
LOGCXX-500: Merge branch 'master' 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/65ebfef6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/65ebfef6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/65ebfef6
Branch: refs/heads/LOGCXX-500
Commit: 65ebfef68e009b6811110af3b310d973ac554286
Parents: 9f75f7f e318837
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Mon Aug 20 08:47:38 2018 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Mon Aug 20 08:47:38 2018 +0200
----------------------------------------------------------------------
src/main/cpp/mutex.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/65ebfef6/src/main/cpp/mutex.cpp
----------------------------------------------------------------------
diff --cc src/main/cpp/mutex.cpp
index 2f3de1a,3ee29dd..2a1f79d
mode 100755,100644..100755
--- a/src/main/cpp/mutex.cpp
+++ b/src/main/cpp/mutex.cpp
@@@ -16,11 -16,10 +16,11 @@@
*/
#include <log4cxx/logstring.h>
- #include <log4cxx/helpers/mutex.h>
#include <log4cxx/helpers/exception.h>
+ #include <log4cxx/helpers/mutex.h>
#include <log4cxx/helpers/pool.h>
#include <apr_thread_mutex.h>
+#include <apr_thread_rwlock.h>
#include <assert.h>
#if !defined(LOG4CXX)
#define LOG4CXX 1