diff options
| author | Sverker Eriksson <[email protected]> | 2014-03-14 16:07:38 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-03-14 16:07:38 +0100 |
| commit | 237264bc018b0cc17afeac5d3f6030073f314f9d (patch) | |
| tree | 8817ef7e7e3cf6bb59d95907016ada4f96f34e86 /lib/kernel | |
| parent | f076fc4126dd597d8681b18c23d2c76fbd4b9672 (diff) | |
| parent | a996e168bfebe599cfe393cd132a87984d905d84 (diff) | |
| download | otp-237264bc018b0cc17afeac5d3f6030073f314f9d.tar.gz otp-237264bc018b0cc17afeac5d3f6030073f314f9d.tar.bz2 otp-237264bc018b0cc17afeac5d3f6030073f314f9d.zip | |
Merge branch 'sverk/maps-erl_interface'
* sverk/maps-erl_interface:
erts: Add distribution capability flag for maps DFLAG_MAP_TAG
erts: Change external format for maps
erts: Document external format for maps (MAP_EXT)
erl_interface: Add test for ei_skip_term of container terms
erl_interface: Add map support in ei_skip_term
erl_interface: Fix mem leak in ei_decode_encode_test
erl_interface: test decode/encode of maps
erl_interface: Add ei encode/decode for maps
erl_interface: test decode_encode of tuples and lists
erl_interface: refactor ei_decode_encode_test.c
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/include/dist.hrl | 3 | ||||
| -rw-r--r-- | lib/kernel/src/dist_util.erl | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/kernel/include/dist.hrl b/lib/kernel/include/dist.hrl index e32c112e63..77556d1303 100644 --- a/lib/kernel/include/dist.hrl +++ b/lib/kernel/include/dist.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2013. All Rights Reserved. +%% Copyright Ericsson AB 1999-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -37,3 +37,4 @@ -define(DFLAG_DIST_HDR_ATOM_CACHE,16#2000). -define(DFLAG_SMALL_ATOM_TAGS, 16#4000). -define(DFLAG_UTF8_ATOMS, 16#10000). +-define(DFLAG_MAP_TAG, 16#20000). diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl index fc50ec6717..b127fe2e33 100644 --- a/lib/kernel/src/dist_util.erl +++ b/lib/kernel/src/dist_util.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2013. All Rights Reserved. +%% Copyright Ericsson AB 1999-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -116,7 +116,8 @@ make_this_flags(RequestType, OtherNode) -> ?DFLAG_UNICODE_IO bor ?DFLAG_DIST_HDR_ATOM_CACHE bor ?DFLAG_SMALL_ATOM_TAGS bor - ?DFLAG_UTF8_ATOMS). + ?DFLAG_UTF8_ATOMS bor + ?DFLAG_MAP_TAG). handshake_other_started(#hs_data{request_type=ReqType}=HSData0) -> {PreOtherFlags,Node,Version} = recv_name(HSData0), |