summaryrefslogtreecommitdiff
path: root/rts/RetainerSet.h
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2016-11-29 16:51:30 -0500
committerBen Gamari <ben@smart-cactus.org>2016-11-29 16:51:30 -0500
commit428e152be6bb0fd3867e41cee82a6d5968a11a26 (patch)
treee43d217c10c052704f872cd7e1df4d335c12d376 /rts/RetainerSet.h
parent56d74515396c8b6360ba7898cbc4b68f0f1fb2ea (diff)
downloadhaskell-428e152be6bb0fd3867e41cee82a6d5968a11a26.tar.gz
Use C99's bool
Test Plan: Validate on lots of platforms Reviewers: erikd, simonmar, austin Reviewed By: erikd, simonmar Subscribers: michalt, thomie Differential Revision: https://phabricator.haskell.org/D2699
Diffstat (limited to 'rts/RetainerSet.h')
-rw-r--r--rts/RetainerSet.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/rts/RetainerSet.h b/rts/RetainerSet.h
index c581293e8b..55a9989926 100644
--- a/rts/RetainerSet.h
+++ b/rts/RetainerSet.h
@@ -116,9 +116,9 @@ extern RetainerSet rs_MANY;
// it is not easy either to write it as a macro (due to my lack of C
// programming experience). Sungwoo
//
-// rtsBool isMember(retainer, retainerSet *);
+// bool isMember(retainer, retainerSet *);
/*
- Returns rtsTrue if r is a member of *rs.
+ Returns true if r is a member of *rs.
Invariants:
rs is not NULL.
Note:
@@ -129,19 +129,19 @@ extern RetainerSet rs_MANY;
*/
#define BINARY_SEARCH_THRESHOLD 8
-INLINE_HEADER rtsBool
+INLINE_HEADER bool
isMember(retainer r, RetainerSet *rs)
{
int i, left, right; // must be int, not uint32_t (because -1 can appear)
retainer ri;
- if (rs == &rs_MANY) { return rtsTrue; }
+ if (rs == &rs_MANY) { return true; }
if (rs->num < BINARY_SEARCH_THRESHOLD) {
for (i = 0; i < (int)rs->num; i++) {
ri = rs->element[i];
- if (r == ri) return rtsTrue;
- else if (r < ri) return rtsFalse;
+ if (r == ri) return true;
+ else if (r < ri) return false;
}
} else {
left = 0;
@@ -149,12 +149,12 @@ isMember(retainer r, RetainerSet *rs)
while (left <= right) {
i = (left + right) / 2;
ri = rs->element[i];
- if (r == ri) return rtsTrue;
+ if (r == ri) return true;
else if (r < ri) right = i - 1;
else left = i + 1;
}
}
- return rtsFalse;
+ return false;
}
// Finds or creates a retainer set augmented with a new retainer.