head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.50
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.48
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.46
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.44
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.42
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.40
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.38
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.36
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.34
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.32
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.30
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.28
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.26
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.24
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.22
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.20
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.18
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.16
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.14
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.12
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.10
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.8
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.6
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.4
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.2
	pkgsrc-2020Q1-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2020.03.27.20.51.23;	author joerg;	state Exp;
branches;
next	;
commitid	5jILaVCwRCSv952C;


desc
@@


1.1
log
@Resolve conflict with std::this_thread.
@
text
@$NetBSD$

--- src/cxx_supportlib/oxt/system_calls.cpp.orig	2020-03-27 15:09:11.254324657 +0000
+++ src/cxx_supportlib/oxt/system_calls.cpp
@@@@ -132,15 +132,15 @@@@ shouldSimulateFailure() {
 			_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 @@@@ syscalls::close(int fd) {
 		}
 		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 @@@@ syscalls::nanosleep(const struct timespe
 		}
 	} 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 @@@@ syscalls::nanosleep(const struct timespe
 
 	if (ret == -1
 	 && e == EINTR
-	 && this_thread::syscalls_interruptable()
+	 && boost::this_thread::syscalls_interruptable()
 	 && intr_requested) {
 		throw thread_interrupted();
 	}
@@@@ -748,14 +748,14 @@@@ syscalls::waitpid(pid_t pid, int *status
 	 * http://stackoverflow.com/questions/20410943/segmentation-fault-when-accessing-statically-initialized-thread-variable?noredirect=1#comment30483943_20410943
 	 * https://bugzilla.redhat.com/show_bug.cgi?id=731228
 	 */
-	__thread int this_thread::_syscalls_interruptable = 1;
+	__thread int boost::this_thread::_syscalls_interruptable = 1;
 
 	bool
 	boost::this_thread::syscalls_interruptable() {
 		return _syscalls_interruptable;
 	}
 #else
-	boost::thread_specific_ptr<bool> this_thread::_syscalls_interruptable;
+	boost::thread_specific_ptr<bool> boost::this_thread::_syscalls_interruptable;
 
 	bool
 	boost::this_thread::syscalls_interruptable() {
@