Fix problem with circular type reference.

invenia · Oct 22, 2015 · f1cb675 · f1cb675
1 parent e1eb829
commit f1cb675
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/ReadWriteLocks.jl b/src/ReadWriteLocks.jl
@@ -17,7 +17,17 @@ if !isdefined(Base, :Mutex)
     unlock!(x::Mutex) = unlock(x)
 end
 
-type ReadWriteLock
+abstract _Lock
+
+immutable ReadLock{T<:_Lock}
+    rwlock::T
+end
+
+immutable WriteLock{T<:_Lock}
+    rwlock::T
+end
+
+type ReadWriteLock <: _Lock
     readers::Int
     writer::Bool
     lock::Mutex  # reentrant mutex
@@ -37,10 +47,6 @@ end
 read_lock(rwlock::ReadWriteLock) = rwlock.read_lock
 write_lock(rwlock::ReadWriteLock) = rwlock.write_lock
 
-immutable ReadLock
-    rwlock::ReadWriteLock
-end
-
 function lock!(read_lock::ReadLock)
     rwlock = read_lock.rwlock
     lock!(rwlock.lock)
@@ -74,10 +80,6 @@ function unlock!(read_lock::ReadLock)
     return nothing
 end
 
-immutable WriteLock
-    rwlock::ReadWriteLock
-end
-
 function lock!(write_lock::WriteLock)
     rwlock = write_lock.rwlock
     lock!(rwlock.lock)