diff options
| author | Sverker Eriksson <[email protected]> | 2015-06-15 14:28:34 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-06-15 14:28:34 +0200 |
| commit | 0aa4393922d7f69aa4fb7a7dd30ad8dba1076c63 (patch) | |
| tree | 5055b6e83a3ee509316459d0f1b195605c784ffa /erts/emulator/beam/erl_term.h | |
| parent | b130093994e7bfe45c92579af3068558e45a6c30 (diff) | |
| parent | f7ef9fb1679fcd46c48ec5f8a968f7e053b3d4ed (diff) | |
| download | otp-0aa4393922d7f69aa4fb7a7dd30ad8dba1076c63.tar.gz otp-0aa4393922d7f69aa4fb7a7dd30ad8dba1076c63.tar.bz2 otp-0aa4393922d7f69aa4fb7a7dd30ad8dba1076c63.zip | |
Merge branch 'sverk/map-merge-trap'
* sverk/map-merge-trap:
erts: Optimize maps:merge
erts: Yield in maps:merge
erts: Refactor arg swapping for maps:merge
erts: Add save/restore for PSTACK
erts: Fix magic binary alignment on 32-bit
erts: Add maps to send_term_SUITE
erts: Fix calculation of reclaimed data during full gc
erts: Fix warning about const pointer to make_boxed and make_list
erts: Fix typo in etp-carrier-blocks
Diffstat (limited to 'erts/emulator/beam/erl_term.h')
| -rw-r--r-- | erts/emulator/beam/erl_term.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_term.h b/erts/emulator/beam/erl_term.h index 602aab46dc..7b15b34da1 100644 --- a/erts/emulator/beam/erl_term.h +++ b/erts/emulator/beam/erl_term.h @@ -198,7 +198,7 @@ struct erl_node_; /* Declared in erl_node_tables.h */ #endif #define _is_aligned(x) (((Uint)(x) & 0x3) == 0) #define _unchecked_make_boxed(x) ((Uint) COMPRESS_POINTER(x) + TAG_PRIMARY_BOXED) -_ET_DECLARE_CHECKED(Eterm,make_boxed,Eterm*) +_ET_DECLARE_CHECKED(Eterm,make_boxed,const Eterm*) #define make_boxed(x) _ET_APPLY(make_boxed,(x)) #if 1 #define _is_not_boxed(x) ((x) & (_TAG_PRIMARY_MASK-TAG_PRIMARY_BOXED)) @@ -214,7 +214,7 @@ _ET_DECLARE_CHECKED(Eterm*,boxed_val,Wterm) /* cons cell ("list") access methods */ #define _unchecked_make_list(x) ((Uint) COMPRESS_POINTER(x) + TAG_PRIMARY_LIST) -_ET_DECLARE_CHECKED(Eterm,make_list,Eterm*) +_ET_DECLARE_CHECKED(Eterm,make_list,const Eterm*) #define make_list(x) _ET_APPLY(make_list,(x)) #if 1 #define _unchecked_is_not_list(x) ((x) & (_TAG_PRIMARY_MASK-TAG_PRIMARY_LIST)) |