xref: /OK3568_Linux_fs/yocto/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1*4882a593SmuzhiyunDescription: Fix compilation with gcc-6
2*4882a593SmuzhiyunAuthor: Gert Wollny <gw.fossdev@gmail.com>
3*4882a593SmuzhiyunLast-Updated: 2016-07-26
4*4882a593SmuzhiyunForwarded: No
5*4882a593SmuzhiyunBug-Debian: https://bugs.debian.org/811659
6*4882a593SmuzhiyunBug-Debian: https://bugs.debian.org/831146
7*4882a593Smuzhiyun
8*4882a593Smuzhiyun--- a/streams/wvstream.cc
9*4882a593Smuzhiyun+++ b/streams/wvstream.cc
10*4882a593Smuzhiyun@@ -907,9 +907,9 @@
11*4882a593Smuzhiyun
12*4882a593Smuzhiyun     if (forceable)
13*4882a593Smuzhiyun     {
14*4882a593Smuzhiyun-	si.wants.readable = readcb;
15*4882a593Smuzhiyun-	si.wants.writable = writecb;
16*4882a593Smuzhiyun-	si.wants.isexception = exceptcb;
17*4882a593Smuzhiyun+	si.wants.readable = static_cast<bool>(readcb);
18*4882a593Smuzhiyun+	si.wants.writable = static_cast<bool>(writecb);
19*4882a593Smuzhiyun+	si.wants.isexception = static_cast<bool>(exceptcb);
20*4882a593Smuzhiyun     }
21*4882a593Smuzhiyun     else
22*4882a593Smuzhiyun     {
23*4882a593Smuzhiyun@@ -1019,7 +1019,8 @@
24*4882a593Smuzhiyun
25*4882a593Smuzhiyun IWvStream::SelectRequest WvStream::get_select_request()
26*4882a593Smuzhiyun {
27*4882a593Smuzhiyun-    return IWvStream::SelectRequest(readcb, writecb, exceptcb);
28*4882a593Smuzhiyun+    return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb),
29*4882a593Smuzhiyun+				    static_cast<bool>(exceptcb));
30*4882a593Smuzhiyun }
31*4882a593Smuzhiyun
32*4882a593Smuzhiyun
33*4882a593Smuzhiyun@@ -1107,7 +1108,8 @@
34*4882a593Smuzhiyun     // inefficient, because if the alarm was expired then pre_select()
35*4882a593Smuzhiyun     // returned true anyway and short-circuited the previous select().
36*4882a593Smuzhiyun     TRACE("hello-%p\n", this);
37*4882a593Smuzhiyun-    return !alarm_was_ticking || select(0, readcb, writecb, exceptcb);
38*4882a593Smuzhiyun+    return !alarm_was_ticking || select(0, static_cast<bool>(readcb),
39*4882a593Smuzhiyun+					static_cast<bool>(writecb), static_cast<bool>(exceptcb));
40*4882a593Smuzhiyun }
41*4882a593Smuzhiyun
42*4882a593Smuzhiyun
43