Merge branch 'master' into sr

This commit is contained in:
Heng Li 2017-10-04 11:42:44 -04:00
commit 841763ec24
2 changed files with 2 additions and 1 deletions

View File

@ -426,6 +426,7 @@ static int mm_align1_inv(void *km, const mm_mapopt_t *opt, const mm_idx_t *mi, i
r_inv->parent = MM_PARENT_UNSET;
r_inv->inv = 1;
r_inv->rev = !r1->rev;
r_inv->rid = r1->rid;
r_inv->qs = r1->qe + q_off, r_inv->qe = r_inv->qs + ez->max_q + 1;
r_inv->rs = r1->re + t_off, r_inv->re = r_inv->rs + ez->max_t + 1;
ret = 1;

2
main.c
View File

@ -6,7 +6,7 @@
#include "mmpriv.h"
#include "getopt.h"
#define MM_VERSION "2.2-r457-dirty"
#define MM_VERSION "2.2-r459-dirty"
#ifdef __linux__
#include <sys/resource.h>