mirror of
https://github.com/Icinga/icinga2.git
synced 2025-09-25 10:48:20 +02:00
Fix compiler warnings by replacing x&&y||z with (x&&y)||z
This commit is contained in:
parent
6d885a4f3f
commit
4019ad5bb7
@ -54,7 +54,7 @@ void Connect(Socket& socket, const String& node, const String& service)
|
|||||||
} catch (const std::exception& ex) {
|
} catch (const std::exception& ex) {
|
||||||
auto se (dynamic_cast<const boost::system::system_error*>(&ex));
|
auto se (dynamic_cast<const boost::system::system_error*>(&ex));
|
||||||
|
|
||||||
if (se && se->code() == boost::asio::error::operation_aborted || ++current == result.end()) {
|
if ((se && se->code() == boost::asio::error::operation_aborted) || ++current == result.end()) {
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -84,7 +84,7 @@ void Connect(Socket& socket, const String& node, const String& service, boost::a
|
|||||||
} catch (const std::exception& ex) {
|
} catch (const std::exception& ex) {
|
||||||
auto se (dynamic_cast<const boost::system::system_error*>(&ex));
|
auto se (dynamic_cast<const boost::system::system_error*>(&ex));
|
||||||
|
|
||||||
if (se && se->code() == boost::asio::error::operation_aborted || ++current == result.end()) {
|
if ((se && se->code() == boost::asio::error::operation_aborted) || ++current == result.end()) {
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user