use ReadWriteLockCPP11 instead of ReadWriteLock

ReadWriteLock is now a typedef for ReadWriteLockCPP11 one of the classes will finally be removed when it is known which locking concept is superior
dim123 · Mar 29, 2017 · d99945e · d99945e
1 parent bf6e3bd
commit d99945e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/lib/Basics/ReadWriteLock.cpp b/lib/Basics/ReadWriteLock.cpp
@@ -24,6 +24,7 @@
 
 #include "ReadWriteLock.h"
 
+#if 0
 using namespace arangodb::basics;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -127,3 +128,5 @@ void ReadWriteLock::unlockRead() {
 void ReadWriteLock::unlockWrite() {
   TRI_WriteUnlockReadWriteLock(&_rwlock);
 }
+
+#endif
diff --git a/lib/Basics/ReadWriteLock.h b/lib/Basics/ReadWriteLock.h
@@ -27,10 +27,14 @@
 
 #include "Basics/Common.h"
 #include "Basics/locks.h"
+#include "Basics/ReadWriteLockCPP11.h"
 
 namespace arangodb {
 namespace basics {
 
+typedef ReadWriteLockCPP11 ReadWriteLock;
+
+#if 0
 /// @brief read-write lock
 class ReadWriteLock {
   ReadWriteLock(ReadWriteLock const&) = delete;
@@ -82,6 +86,9 @@ class ReadWriteLock {
   /// @brief write lock marker
   bool _writeLocked;
 };
+
+#endif
+
 }
 }
 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -137,7 +137,6 @@ add_library(${LIB_ARANGO} STATIC
   Basics/MutexLocker.cpp
   Basics/Nonce.cpp
   Basics/OpenFilesTracker.cpp
-  Basics/ReadWriteLock.cpp
   Basics/ReadWriteLockCPP11.cpp
   Basics/StaticStrings.cpp
   Basics/StringBuffer.cpp