blob: 6ce971b856c082049a32d294e137fc1d929ac5d5 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
--- ../passenger-6.0.4/src/cxx_supportlib/oxt/system_calls.cpp.original 2019-11-15 01:35:57.674449000 +0200
+++ ../passenger-6.0.4/src/cxx_supportlib/oxt/system_calls.cpp 2019-11-15 01:36:06.053234000 +0200
@@ -132,15 +132,15 @@
_my_errno = errno; \
} while ((error_expression) \
&& _my_errno == EINTR \
- && (!this_thread::syscalls_interruptable() \
- || !(_intr_requested = this_thread::interruption_requested())) \
+ && (!boost::this_thread::syscalls_interruptable() \
+ || !(_intr_requested = boost::this_thread::interruption_requested())) \
); \
if (OXT_LIKELY(ctx != NULL)) { \
ctx->syscall_interruption_lock.lock(); \
} \
if ((error_expression) \
&& _my_errno == EINTR \
- && this_thread::syscalls_interruptable() \
+ && boost::this_thread::syscalls_interruptable() \
&& _intr_requested) { \
throw thread_interrupted(); \
} \
@@ -284,8 +284,8 @@
}
if (ret == -1
&& errno == EINTR
- && this_thread::syscalls_interruptable()
- && this_thread::interruption_requested()) {
+ && boost::this_thread::syscalls_interruptable()
+ && boost::this_thread::interruption_requested()) {
throw thread_interrupted();
} else {
return ret;
@@ -662,8 +662,8 @@
}
} while (ret == -1
&& e == EINTR
- && (!this_thread::syscalls_interruptable()
- || !(intr_requested = this_thread::interruption_requested()))
+ && (!boost::this_thread::syscalls_interruptable()
+ || !(intr_requested = boost::this_thread::interruption_requested()))
);
if (OXT_UNLIKELY(ctx != NULL)) {
@@ -672,7 +672,7 @@
if (ret == -1
&& e == EINTR
- && this_thread::syscalls_interruptable()
+ && boost::this_thread::syscalls_interruptable()
&& intr_requested) {
throw thread_interrupted();
}
|
