diff options
| author | Sverker Eriksson <[email protected]> | 2011-07-12 16:17:42 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-07-12 16:17:42 +0200 |
| commit | 66829b77b0becadecb2fef480b66f69e95498bf7 (patch) | |
| tree | 0831a7255d5b2b5e024cbe0f00856ae3e4aa1fec /erts/emulator/beam/erl_bestfit_alloc.h | |
| parent | 80865e03583ebbee63a2a72be708f28c1e4a4f98 (diff) | |
| parent | 089b8c357f5e7c96605c8f8cab4b3c856081dc39 (diff) | |
| download | otp-66829b77b0becadecb2fef480b66f69e95498bf7.tar.gz otp-66829b77b0becadecb2fef480b66f69e95498bf7.tar.bz2 otp-66829b77b0becadecb2fef480b66f69e95498bf7.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'erts/emulator/beam/erl_bestfit_alloc.h')
| -rw-r--r-- | erts/emulator/beam/erl_bestfit_alloc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bestfit_alloc.h b/erts/emulator/beam/erl_bestfit_alloc.h index cb35e21e57..faa2d9742e 100644 --- a/erts/emulator/beam/erl_bestfit_alloc.h +++ b/erts/emulator/beam/erl_bestfit_alloc.h @@ -54,7 +54,8 @@ typedef struct RBTree_t_ RBTree_t; struct BFAllctr_t_ { Allctr_t allctr; /* Has to be first! */ - RBTree_t * root; + RBTree_t * mbc_root; + RBTree_t * sbmbc_root; int address_order; }; |