Skip to content

Commit e0be741

Browse files
committed
---
yaml --- r: 7976 b: refs/heads/snap-stage3 c: 6b5f786 h: refs/heads/master v: v3
1 parent a113df9 commit e0be741

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: f954ce5ef18391efcb21e757e5e6546b2599e940
4+
refs/heads/snap-stage3: 6b5f7865bea09737f67fa7ff5af5ee49b52955bb
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rt/sync/lock_and_signal.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#if defined(__WIN32__)
1313
lock_and_signal::lock_and_signal()
14-
: alive(true)
1514
{
1615
// FIXME: In order to match the behavior of pthread_cond_broadcast on
1716
// Windows, we create manual reset events. This however breaks the
@@ -24,7 +23,7 @@ lock_and_signal::lock_and_signal()
2423

2524
#else
2625
lock_and_signal::lock_and_signal()
27-
: _locked(false), alive(true)
26+
: _locked(false)
2827
{
2928
CHECKED(pthread_cond_init(&_cond, NULL));
3029
CHECKED(pthread_mutex_init(&_mutex, NULL));
@@ -38,7 +37,6 @@ lock_and_signal::~lock_and_signal() {
3837
CHECKED(pthread_cond_destroy(&_cond));
3938
CHECKED(pthread_mutex_destroy(&_mutex));
4039
#endif
41-
alive = false;
4240
}
4341

4442
void lock_and_signal::lock() {

branches/snap-stage3/src/rt/sync/lock_and_signal.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ class lock_and_signal {
1515
#endif
1616
bool _locked;
1717

18-
bool alive;
19-
2018
public:
2119
lock_and_signal();
2220
virtual ~lock_and_signal();

0 commit comments

Comments
 (0)