Merge branch 'LOGCXX-500' into LOGCXX-500-2
diff --git a/src/main/include/log4cxx/helpers/mutex.h b/src/main/include/log4cxx/helpers/mutex.h
index 58cf7db..ea8b18e 100644
--- a/src/main/include/log4cxx/helpers/mutex.h
+++ b/src/main/include/log4cxx/helpers/mutex.h
@@ -20,7 +20,7 @@
#include <log4cxx/log4cxx.h>
-#include <apr-1.0/apr_portable.h>
+#include <apr_portable.h>
#include <atomic>
@@ -83,15 +83,6 @@
} // namespace helpers
} // namespace log4cxx
-//#define SHARED_MUTEX_INIT(mutex, p) mutex()
-//#define SHARED_MUTEX shared_mutex_recursive
-
-//#define SHARED_MUTEX std::shared_mutex
-
-//#define SHARED_MUTEX_INIT(mutex, p) mutex(p)
-//#define SHARED_MUTEX log4cxx::helpers::Mutex
-
-
#define SHARED_MUTEX log4cxx::helpers::RWMutex
#define SHARED_MUTEX_INIT(mutex, p) mutex(p)
@@ -121,6 +112,4 @@
#define SEMAPHORE log4cxx::helpers::Semaphore
-//#define SEMAPHORE log4cxx::helpers::Condition
-
#endif //_LOG4CXX_HELPERS_MUTEX_H
diff --git a/src/main/include/log4cxx/helpers/synchronized.h b/src/main/include/log4cxx/helpers/synchronized.h
index f4b31d7..e4df183 100644
--- a/src/main/include/log4cxx/helpers/synchronized.h
+++ b/src/main/include/log4cxx/helpers/synchronized.h
@@ -90,17 +90,7 @@
}
}
-//#define LOCK_R std::shared_lock<shared_mutex_recursive>
-//#define LOCK_W std::unique_lock<shared_mutex_recursive>
-
-//#define LOCK std::lock_guard<std::recursive_mutex>
-
-//#define LOCK synchronized
-
#define LOCK_R synchronized_read
#define LOCK_W synchronized_write
-//#define LOCK_R synchronized
-//#define LOCK_W synchronized
-
#endif //_LOG4CXX_HELPERS_SYNCHRONIZED_H
