generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-27 19:10:22 +01:00
Code Issues Projects Releases Wiki Activity

Problem: missing use of C++11 = delete and = default

Browse Source 
Solution: introduce macros ZMQ_DEFAULT and ZMQ_NON_COPYABLE_NOR_MOVABLE
This commit is contained in:
Simon Giesecke
2019-12-08 19:22:04 +01:00
committed by Simon Giesecke
parent 86d7de38ca
commit f60f909899
99 changed files with 178 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/condition_variable.hpp
View File

@@ -44,8 +44,6 @@ class condition_variable_t
public:
inline condition_variable_t () { zmq_assert (false); }
inline ~condition_variable_t () {}
inline int wait (mutex_t *mutex_, int timeout_)
{
zmq_assert (false);
@@ -54,10 +52,7 @@ class condition_variable_t
inline void broadcast () { zmq_assert (false); }
private:
// Disable copy construction and assignment.
condition_variable_t (const condition_variable_t &);
void operator= (const condition_variable_t &);
ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
};
}
@@ -72,8 +67,6 @@ class condition_variable_t
public:
inline condition_variable_t () { InitializeConditionVariable (&_cv); }
inline ~condition_variable_t () {}
inline int wait (mutex_t *mutex_, int timeout_)
{
int rc = SleepConditionVariableCS (&_cv, mutex_->get_cs (), timeout_);
@@ -95,9 +88,7 @@ class condition_variable_t
private:
CONDITION_VARIABLE _cv;
// Disable copy construction and assignment.
condition_variable_t (const condition_variable_t &);
void operator= (const condition_variable_t &);
ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
};
}
@@ -110,9 +101,7 @@ namespace zmq
class condition_variable_t
{
public:
inline condition_variable_t () {}
inline ~condition_variable_t () {}
inline condition_variable_t () ZMQ_DEFAULT;
inline int wait (mutex_t *mutex_, int timeout_)
{
@@ -139,9 +128,7 @@ class condition_variable_t
private:
std::condition_variable_any _cv;
// Disable copy construction and assignment.
condition_variable_t (const condition_variable_t &);
void operator= (const condition_variable_t &);
ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
};
}
@@ -154,7 +141,7 @@ namespace zmq
class condition_variable_t
{
public:
inline condition_variable_t () {}
inline condition_variable_t () ZMQ_DEFAULT;
inline ~condition_variable_t ()
{
@@ -224,9 +211,7 @@ class condition_variable_t
mutex_t _listenersMutex;
std::vector<SEM_ID> _listeners;
// Disable copy construction and assignment.
condition_variable_t (const condition_variable_t &);
const condition_variable_t &operator= (const condition_variable_t &);
ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
};
}
@@ -318,9 +303,7 @@ class condition_variable_t
private:
pthread_cond_t _cond;
// Disable copy construction and assignment.
condition_variable_t (const condition_variable_t &);
const condition_variable_t &operator= (const condition_variable_t &);
ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
};
}