This is an automated email from the ASF dual-hosted git repository.
jmalkin pushed a commit to branch windows_fixes
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git
The following commit(s) were added to refs/heads/windows_fixes by this push:
new 47050fc two more and to && changes
47050fc is described below
commit 47050fcf508332fd5b341428ca69221a173f58fe
Author: Jon Malkin <[email protected]>
AuthorDate: Fri Apr 17 01:33:08 2020 -0700
two more and to && changes
---
kll/include/kll_helper.hpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kll/include/kll_helper.hpp b/kll/include/kll_helper.hpp
index a13e49b..4857f51 100644
--- a/kll/include/kll_helper.hpp
+++ b/kll/include/kll_helper.hpp
@@ -63,7 +63,7 @@ class kll_helper {
if (std::isnan(values[i])) {
throw std::invalid_argument("Values must not be NaN");
}
- if ((i < (size - 1)) and !(C()(values[i], values[i + 1]))) {
+ if ((i < (size - 1)) && !(C()(values[i], values[i + 1]))) {
throw std::invalid_argument("Values must be unique and monotonically
increasing");
}
}
@@ -77,7 +77,7 @@ class kll_helper {
static typename std::enable_if<!std::is_floating_point<T>::value,
void>::type
validate_values(const T* values, uint32_t size) {
for (uint32_t i = 0; i < size ; i++) {
- if ((i < (size - 1)) and !(C()(values[i], values[i + 1]))) {
+ if ((i < (size - 1)) && !(C()(values[i], values[i + 1]))) {
throw std::invalid_argument("Values must be unique and monotonically
increasing");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
