From 582afd9a7f6a32232f80a4bc32a0a4cb084c28ca Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 21 Jun 2018 22:04:31 -0400 Subject: [PATCH] interface & app_server: Fix missing parentheses near ternary operators. + has greater operator precendence than ?, so we need parentheses when using both in expressions. Both of these look like actual bugs. Spotted by Clang. --- src/kits/interface/BMCPrivate.cpp | 2 +- src/servers/app/DelayedMessage.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kits/interface/BMCPrivate.cpp b/src/kits/interface/BMCPrivate.cpp index d8025656b3..6e6ca327e4 100644 --- a/src/kits/interface/BMCPrivate.cpp +++ b/src/kits/interface/BMCPrivate.cpp @@ -352,5 +352,5 @@ _BMCMenuBar_::_Init() left = right = be_control_look->DefaultLabelSpacing(); SetItemMargins(left, top, - right + fShowPopUpMarker ? kPopUpIndicatorWidth : 0, bottom); + right + (fShowPopUpMarker ? kPopUpIndicatorWidth : 0), bottom); } diff --git a/src/servers/app/DelayedMessage.cpp b/src/servers/app/DelayedMessage.cpp index 634fda67ba..11a25a2fe6 100644 --- a/src/servers/app/DelayedMessage.cpp +++ b/src/servers/app/DelayedMessage.cpp @@ -299,7 +299,7 @@ DelayedMessageData::DelayedMessageData(int32 code, bigtime_t delay, bool isSpecificTime) : fCode(code), - fScheduledTime(delay + isSpecificTime ? 0 : system_time()), + fScheduledTime(delay + (isSpecificTime ? 0 : system_time())), fValid(false), fAttachments(3, true),