From 1ca181db1d268984eec95fafff65c3a55720efab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 18 Jan 2019 02:45:23 -0500
Subject: [PATCH] value: simplify expression
---
src/value.cpp | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/value.cpp b/src/value.cpp
index 6f9f5306..b21ba41a 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -497,8 +497,7 @@ template <typename T>
bool subset(std::vector<T> fds, std::vector<T> qfds)
{
for (auto& fd : fds) {
- auto correspondance = std::find_if(qfds.begin(), qfds.end(), [&fd](T& _vfd) { return fd == _vfd; });
- if (correspondance == qfds.end())
+ if (std::find_if(qfds.begin(), qfds.end(), [&fd](T& _vfd) { return fd == _vfd; }) == qfds.end())
return false;
}
return true;
@@ -506,10 +505,9 @@ bool subset(std::vector<T> fds, std::vector<T> qfds)
bool Select::isSatisfiedBy(const Select& os) const {
/* empty, means all values are selected. */
- if (fieldSelection_.empty() and not os.fieldSelection_.empty())
- return false;
- else
- return subset(fieldSelection_, os.fieldSelection_);
+ return fieldSelection_.empty() ?
+ os.fieldSelection_.empty() :
+ subset(fieldSelection_, os.fieldSelection_);
}
bool Where::isSatisfiedBy(const Where& ow) const {
--
GitLab