summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch')
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch
deleted file mode 100644
index b2c2efd5..00000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix building with C++14, which errors out due to explicit operator bool() conversion
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594058
-
---- a/streams/wvstream.cc
-+++ b/streams/wvstream.cc
-@@ -907,9 +907,9 @@
-
- if (forceable)
- {
-- si.wants.readable = readcb;
-- si.wants.writable = writecb;
-- si.wants.isexception = exceptcb;
-+ si.wants.readable = static_cast<bool>(readcb);
-+ si.wants.writable = static_cast<bool>(writecb);
-+ si.wants.isexception = static_cast<bool>(exceptcb);
- }
- else
- {
-@@ -1019,7 +1019,7 @@
-
- IWvStream::SelectRequest WvStream::get_select_request()
- {
-- return IWvStream::SelectRequest(readcb, writecb, exceptcb);
-+ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
- }
-
-
-@@ -1107,7 +1107,7 @@
- // inefficient, because if the alarm was expired then pre_select()
- // returned true anyway and short-circuited the previous select().
- TRACE("hello-%p\n", this);
-- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb);
-+ return !alarm_was_ticking || select(0, static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
- }
-
-