From 66b1bb005296cadfc79004920e3e0662e03efe5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Thu, 1 Mar 2012 15:15:48 +0100
Subject: [PATCH] Fixed masking typo for multisets.
---
src/multiset.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/multiset.c b/src/multiset.c
index cf48fb0a71..42deb6339b 100644
--- a/src/multiset.c
+++ b/src/multiset.c
@@ -3898,7 +3898,7 @@ PMOD_EXPORT struct multiset *add_multisets (struct svalue *vect, int count)
}
if (!size)
- return allocate_multiset (0, indval && MULTISET_INDVAL, cmp_less);
+ return allocate_multiset (0, indval & MULTISET_INDVAL, cmp_less);
for (idx = 0;; idx++) {
l = vect[idx].u.multiset;
@@ -3910,11 +3910,11 @@ PMOD_EXPORT struct multiset *add_multisets (struct svalue *vect, int count)
is_identical (cmp_less, &l->msd->cmp_less) :
TYPEOF(l->msd->cmp_less) == T_INT)) {
res = copy_multiset (l);
- multiset_set_flags (res, indval && MULTISET_INDVAL);
+ multiset_set_flags (res, indval & MULTISET_INDVAL);
idx++;
}
else
- res = allocate_multiset (size, indval && MULTISET_INDVAL, cmp_less);
+ res = allocate_multiset (size, indval & MULTISET_INDVAL, cmp_less);
SET_ONERROR (uwp, do_free_multiset, res);
for (; idx < count; idx++)
--
GitLab