File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -2992,15 +2992,15 @@ class CAPABILITY ( "mutex" ) CSphMutex : public ISphNoncopyable
2992
2992
2993
2993
bool Lock () ACQUIRE ();
2994
2994
bool Unlock () RELEASE ();
2995
- bool TimedLock ( int iMsec ) TRY_ACQUIRE (false );
2995
+ bool TimedLock ( int iMsec ) TRY_ACQUIRE (true );
2996
2996
2997
2997
protected:
2998
2998
#if USE_WINDOWS
2999
2999
HANDLE m_hMutex;
3000
3000
#else
3001
3001
pthread_mutex_t * m_pMutex;
3002
3002
public:
3003
- inline pthread_mutex_t * GetInternalMutex () RETURN_CAPABILITY ( this )
3003
+ inline pthread_mutex_t * GetInternalMutex ()
3004
3004
{
3005
3005
return m_pMutex;
3006
3006
}
@@ -3129,12 +3129,12 @@ class SCOPED_CAPABILITY CSphScopedRLock : ISphNoncopyable
3129
3129
CSphRwlock & m_tLock;
3130
3130
};
3131
3131
3132
- // / scoped shared (write) lock
3132
+ // / scoped exclusive (write) lock
3133
3133
class SCOPED_CAPABILITY CSphScopedWLock : ISphNoncopyable
3134
3134
{
3135
3135
public:
3136
3136
// / lock on creation
3137
- CSphScopedWLock ( CSphRwlock & tLock ) ACQUIRE_SHARED ( tLock )
3137
+ CSphScopedWLock ( CSphRwlock & tLock ) ACQUIRE ( tLock )
3138
3138
: m_tLock ( tLock )
3139
3139
{
3140
3140
m_tLock.WriteLock ();
You can’t perform that action at this time.
0 commit comments