From: Amos Jeffries Date: Sat, 4 Jul 2015 18:32:54 +0000 (-0700) Subject: Revert r14137 due to compile errors X-Git-Tag: merge-candidate-3-v1~52^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e962f4e1e8a2c183fe227324b6f4f79b1e2a8d8;p=thirdparty%2Fsquid.git Revert r14137 due to compile errors --- diff --git a/src/ipc/ReadWriteLock.cc b/src/ipc/ReadWriteLock.cc index da35a4e44c..bca150133a 100644 --- a/src/ipc/ReadWriteLock.cc +++ b/src/ipc/ReadWriteLock.cc @@ -12,15 +12,6 @@ #include "ipc/ReadWriteLock.h" #include "Store.h" -Ipc::ReadWriteLock::ReadWriteLock() -{ - std::atomic_init(readers, 0); - std::atomic_init(writing, false); - std::atomic_init(appending, false); - std::atomic_init(readLevel, 0); - std::atomic_init(writeLevel, 0); -} - bool Ipc::ReadWriteLock::lockShared() { diff --git a/src/ipc/ReadWriteLock.h b/src/ipc/ReadWriteLock.h index aabaeaa451..511a29eb9d 100644 --- a/src/ipc/ReadWriteLock.h +++ b/src/ipc/ReadWriteLock.h @@ -25,7 +25,7 @@ class ReadWriteLockStats; class ReadWriteLock { public: - ReadWriteLock(); + // default constructor is OK because of shared memory zero-initialization bool lockShared(); ///< lock for reading or return false bool lockExclusive(); ///< lock for modification or return false