Skip to content

Commit abe031e

Browse files
Merge branch '180-notify_all' into 175-174-cond_var-and-mutex-testing
2 parents 5ed882c + 83a2864 commit abe031e

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

include/pthread/condition_variable.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ namespace pthread {
136136
*/
137137
cv_status wait_for(mutex &mtx, int millis);
138138

139-
/** Wait for condition to be signaled within given time frame.
139+
/** NOSONAR Wait for condition to be signaled within given time frame.
140140
*
141141
* The method uses the lock_guard's mutex to execute.
142142
*
@@ -207,7 +207,7 @@ namespace pthread {
207207
* @throw condition_variable_exception if the call to pthread_cond_broadcast return value is different from 0 (zero)
208208
* @see pthread_cond_broadcast
209209
*/
210-
void notify_all() noexcept;
210+
void notify_all();
211211

212212
/**
213213
* not copy-assignable

src/condition_variable.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ namespace pthread {
5252
}
5353
}
5454

55-
#if __cplusplus < 201103L
56-
void condition_variable::notify_all () throw(){
57-
#else
58-
void condition_variable::notify_all () noexcept{
59-
#endif
55+
void condition_variable::notify_all () {
6056
int rc = pthread_cond_broadcast ( &_condition );
6157
if ( rc != 0 ){
6258
throw condition_variable_exception{"notify_all failed.", rc};

0 commit comments

Comments
 (0)