diff options
| author | Sverker Eriksson <[email protected]> | 2011-07-29 17:48:07 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-07-29 17:48:07 +0200 |
| commit | 673ca2801ca79c82ff9910ae7cd6578bff161851 (patch) | |
| tree | a1ab1a236891b48be0eecb39262dcea9a396f78d /erts/emulator/beam/erl_bestfit_alloc.c | |
| parent | 6d1abe8e4872d118ebff0ae2e131884f50eb2b7a (diff) | |
| parent | 07936436b8a8b18b80451a09e040283ebecbd43b (diff) | |
| download | otp-673ca2801ca79c82ff9910ae7cd6578bff161851.tar.gz otp-673ca2801ca79c82ff9910ae7cd6578bff161851.tar.bz2 otp-673ca2801ca79c82ff9910ae7cd6578bff161851.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'erts/emulator/beam/erl_bestfit_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_bestfit_alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bestfit_alloc.c b/erts/emulator/beam/erl_bestfit_alloc.c index d9b1170a3d..5e3032ddaa 100644 --- a/erts/emulator/beam/erl_bestfit_alloc.c +++ b/erts/emulator/beam/erl_bestfit_alloc.c @@ -979,6 +979,7 @@ erts_bfalc_test(unsigned long op, unsigned long a1, unsigned long a2) case 0x205: return (unsigned long) ((RBTreeList_t *) a1)->next; case 0x206: return (unsigned long) IS_BLACK((RBTree_t *) a1); case 0x207: return (unsigned long) IS_TREE_NODE((RBTree_t *) a1); + case 0x208: return (unsigned long) 0; /* IS_AOFF */ default: ASSERT(0); return ~((unsigned long) 0); } } |