Merge pull request #29283 from qarmin/fix_some_always_same_values

Remove always true/false values
2019-06-20 21:10:10 +02:00
parent 7b88ac0843 072e40368e
commit 5c66771e3e
32 changed files with 128 additions and 184 deletions
--- a/drivers/unix/net_socket_posix.cpp
+++ b/drivers/unix/net_socket_posix.cpp
@ -421,7 +421,7 @@ Error NetSocketPosix::poll(PollType p_type, int p_timeout) const {
 			pfd.events = POLLOUT;
 			break;
 		case POLL_TYPE_IN_OUT:
-			pfd.events = POLLOUT || POLLIN;
+			pfd.events = POLLOUT | POLLIN;
 	}

 	int ret = ::poll(&pfd, 1, p_timeout);