wok-next annotate wvstreams/stuff/patches/gcc-6.patch @ rev 21678
updated getmail (4.41.0 -> 5.14)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Mon Jun 29 13:44:08 2020 +0100 (2020-06-29) |
| parents | |
| children |
| rev | line source |
|---|---|
| pascal@20134 | 1 Description: Fix compilation with gcc-6 |
| pascal@20134 | 2 Author: Gert Wollny <gw.fossdev@gmail.com> |
| pascal@20134 | 3 Last-Updated: 2016-07-26 |
| pascal@20134 | 4 Forwarded: No |
| pascal@20134 | 5 Bug-Debian: https://bugs.debian.org/811659 |
| pascal@20134 | 6 Bug-Debian: https://bugs.debian.org/831146 |
| pascal@20134 | 7 |
| pascal@20134 | 8 --- a/streams/wvstream.cc |
| pascal@20134 | 9 +++ b/streams/wvstream.cc |
| pascal@20134 | 10 @@ -907,9 +907,9 @@ |
| pascal@20134 | 11 |
| pascal@20134 | 12 if (forceable) |
| pascal@20134 | 13 { |
| pascal@20134 | 14 - si.wants.readable = readcb; |
| pascal@20134 | 15 - si.wants.writable = writecb; |
| pascal@20134 | 16 - si.wants.isexception = exceptcb; |
| pascal@20134 | 17 + si.wants.readable = static_cast<bool>(readcb); |
| pascal@20134 | 18 + si.wants.writable = static_cast<bool>(writecb); |
| pascal@20134 | 19 + si.wants.isexception = static_cast<bool>(exceptcb); |
| pascal@20134 | 20 } |
| pascal@20134 | 21 else |
| pascal@20134 | 22 { |
| pascal@20134 | 23 @@ -1019,7 +1019,8 @@ |
| pascal@20134 | 24 |
| pascal@20134 | 25 IWvStream::SelectRequest WvStream::get_select_request() |
| pascal@20134 | 26 { |
| pascal@20134 | 27 - return IWvStream::SelectRequest(readcb, writecb, exceptcb); |
| pascal@20134 | 28 + return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), |
| pascal@20134 | 29 + static_cast<bool>(exceptcb)); |
| pascal@20134 | 30 } |
| pascal@20134 | 31 |
| pascal@20134 | 32 |
| pascal@20134 | 33 @@ -1107,7 +1108,8 @@ |
| pascal@20134 | 34 // inefficient, because if the alarm was expired then pre_select() |
| pascal@20134 | 35 // returned true anyway and short-circuited the previous select(). |
| pascal@20134 | 36 TRACE("hello-%p\n", this); |
| pascal@20134 | 37 - return !alarm_was_ticking || select(0, readcb, writecb, exceptcb); |
| pascal@20134 | 38 + return !alarm_was_ticking || select(0, static_cast<bool>(readcb), |
| pascal@20134 | 39 + static_cast<bool>(writecb), static_cast<bool>(exceptcb)); |
| pascal@20134 | 40 } |
| pascal@20134 | 41 |
| pascal@20134 | 42 |