Commit 72bc51ee authored by Pavel Vainerman's avatar Pavel Vainerman

Подправил объявления mutex-ов (в соответсвии с c++11)

parent 0d42089b
...@@ -52,8 +52,8 @@ namespace UniSetTypes ...@@ -52,8 +52,8 @@ namespace UniSetTypes
private: private:
friend class uniset_mutex_lock; friend class uniset_mutex_lock;
uniset_mutex(const uniset_mutex& r); uniset_mutex(const uniset_mutex& r)=delete;
const uniset_mutex &operator=(const uniset_mutex& r); const uniset_mutex &operator=(const uniset_mutex& r) = delete;
std::string nm; std::string nm;
std::timed_mutex m_lock; std::timed_mutex m_lock;
}; };
...@@ -80,8 +80,8 @@ namespace UniSetTypes ...@@ -80,8 +80,8 @@ namespace UniSetTypes
uniset_mutex* mutex; uniset_mutex* mutex;
std::atomic<int> locked; std::atomic<int> locked;
uniset_mutex_lock(const uniset_mutex_lock&); uniset_mutex_lock(const uniset_mutex_lock&)=delete;
uniset_mutex_lock& operator=(const uniset_mutex_lock&); uniset_mutex_lock& operator=(const uniset_mutex_lock&)=delete;
}; };
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
...@@ -126,8 +126,8 @@ namespace UniSetTypes ...@@ -126,8 +126,8 @@ namespace UniSetTypes
~uniset_rwmutex_wrlock(); ~uniset_rwmutex_wrlock();
private: private:
uniset_rwmutex_wrlock(const uniset_rwmutex_wrlock&); uniset_rwmutex_wrlock(const uniset_rwmutex_wrlock&)=delete;
uniset_rwmutex_wrlock& operator=(const uniset_rwmutex_wrlock&); uniset_rwmutex_wrlock& operator=(const uniset_rwmutex_wrlock&)=delete;
uniset_rwmutex& m; uniset_rwmutex& m;
}; };
...@@ -138,8 +138,8 @@ namespace UniSetTypes ...@@ -138,8 +138,8 @@ namespace UniSetTypes
~uniset_rwmutex_rlock(); ~uniset_rwmutex_rlock();
private: private:
uniset_rwmutex_rlock(const uniset_rwmutex_rlock&); uniset_rwmutex_rlock(const uniset_rwmutex_rlock&)=delete;
uniset_rwmutex_rlock& operator=(const uniset_rwmutex_rlock&); uniset_rwmutex_rlock& operator=(const uniset_rwmutex_rlock&)=delete;
uniset_rwmutex& m; uniset_rwmutex& m;
}; };
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
......
...@@ -213,20 +213,6 @@ uniset_rwmutex_wrlock::~uniset_rwmutex_wrlock() ...@@ -213,20 +213,6 @@ uniset_rwmutex_wrlock::~uniset_rwmutex_wrlock()
{ {
m.unlock(); m.unlock();
} }
uniset_rwmutex_wrlock::uniset_rwmutex_wrlock( const uniset_rwmutex_wrlock& r ):
m(r.m)
{
}
uniset_rwmutex_wrlock& uniset_rwmutex_wrlock::operator=(const uniset_rwmutex_wrlock& r)
{
if( this != &r )
m = r.m;
return *this;
}
// ------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------
uniset_rwmutex_rlock::uniset_rwmutex_rlock( uniset_rwmutex& _m ): uniset_rwmutex_rlock::uniset_rwmutex_rlock( uniset_rwmutex& _m ):
m(_m) m(_m)
...@@ -238,18 +224,4 @@ uniset_rwmutex_rlock::~uniset_rwmutex_rlock() ...@@ -238,18 +224,4 @@ uniset_rwmutex_rlock::~uniset_rwmutex_rlock()
{ {
m.unlock(); m.unlock();
} }
uniset_rwmutex_rlock::uniset_rwmutex_rlock( const uniset_rwmutex_rlock& r ):
m(r.m)
{
}
uniset_rwmutex_rlock& uniset_rwmutex_rlock::operator=(const uniset_rwmutex_rlock& r)
{
if( this != &r )
m = r.m;
return *this;
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment