From 8f577e9d25cc388282bb8e07906b2ee2c62c2b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Fri, 19 May 2017 14:31:36 +0200 Subject: [PATCH] usb: use if-else in packet_handler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently this construct leads to a compiler errors like error: second operand to the conditional operator is of type ‘void’, but the third operand is neither a throw-expression nor of type ‘void’ --- repos/os/include/usb/packet_handler.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repos/os/include/usb/packet_handler.h b/repos/os/include/usb/packet_handler.h index 6dc5f840db..7b84b0fa26 100644 --- a/repos/os/include/usb/packet_handler.h +++ b/repos/os/include/usb/packet_handler.h @@ -76,7 +76,8 @@ class Usb::Packet_handler void wait_for_packet() { - packet_avail() ? _packet_handler() : _ep.wait_and_dispatch_one_io_signal(); + if (packet_avail()) { _packet_handler(); } + else { _ep.wait_and_dispatch_one_io_signal(); } } Packet_descriptor alloc(size_t size)