Merge CK as of commit 24d26965d1a28039062ba3bcf9433b623f3d2c5e, to get

a fix in ck_epoch.
This commit is contained in:
cognet 2017-02-28 23:30:14 +00:00
parent 0969d8271c
commit 53c6abb4ce
2 changed files with 3 additions and 2 deletions

View File

@ -57,7 +57,7 @@
#define CK_MD_RMO
#endif /* CK_MD_RMO */
#define CK_VERSION "0.5.2"
#define CK_VERSION "0.6.0"
#define CK_GIT_SHA ""
/*

View File

@ -309,11 +309,12 @@ ck_epoch_scan(struct ck_epoch *global,
{
ck_stack_entry_t *cursor;
*af = false;
if (cr == NULL) {
cursor = CK_STACK_FIRST(&global->records);
*af = false;
} else {
cursor = &cr->record_next;
*af = true;
}
while (cursor != NULL) {