diff options
| author | Sverker Eriksson <[email protected]> | 2019-04-17 19:09:57 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-04-17 19:09:57 +0200 |
| commit | 236cb4b5eb3b89c837324a5ae7a11117d671d717 (patch) | |
| tree | 41a090786155ab22d5c7a883c275c59d059a4ea0 /lib/jinterface | |
| parent | dbe9bbfb801bcd92cc54c73ce96203b3a04c5517 (diff) | |
| parent | 6a0deeae54ee18aa2028e994c33d633bb41021ed (diff) | |
| download | otp-236cb4b5eb3b89c837324a5ae7a11117d671d717.tar.gz otp-236cb4b5eb3b89c837324a5ae7a11117d671d717.tar.bz2 otp-236cb4b5eb3b89c837324a5ae7a11117d671d717.zip | |
Merge branch 'sverker/bit-binary-ext/OTP-15712'
* sverker/bit-binary-ext/OTP-15712:
jinterface: Add dist flag for export funs
erl_interface: Add bitstring and export fun support
erl_interface: Remove old r9 pid and port compatibility
erl_interface: Refactor ei_decode_SUITE
erl_interface: Fix maps arity from ei_get_type()
erl_interface: Remove ei_get_type_internal()
erl_interface: Deprecate ei_encode_term and ei_decode_term
Diffstat (limited to 'lib/jinterface')
| -rw-r--r-- | lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java | 3 | ||||
| -rw-r--r-- | lib/jinterface/test/nc_SUITE.erl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java index 222330654a..c3f71a84f0 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java @@ -89,7 +89,7 @@ public class AbstractNode implements OtpTransportFactory { static final int dFlagHiddenAtomCache = 0x40; // NOT SUPPORTED static final int dflagNewFunTags = 0x80; static final int dFlagExtendedPidsPorts = 0x100; - static final int dFlagExportPtrTag = 0x200; // NOT SUPPORTED + static final int dFlagExportPtrTag = 0x200; static final int dFlagBitBinaries = 0x400; static final int dFlagNewFloats = 0x800; static final int dFlagUnicodeIo = 0x1000; @@ -105,6 +105,7 @@ public class AbstractNode implements OtpTransportFactory { int flags = dFlagExtendedReferences | dFlagExtendedPidsPorts | dFlagBitBinaries | dFlagNewFloats | dFlagFunTags | dflagNewFunTags | dFlagUtf8Atoms | dFlagMapTag + | dFlagExportPtrTag | dFlagBigCreation; /* initialize hostname and default cookie */ diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl index 4f225a396e..7833d070b7 100644 --- a/lib/jinterface/test/nc_SUITE.erl +++ b/lib/jinterface/test/nc_SUITE.erl @@ -142,7 +142,8 @@ fun_roundtrip(Config) when is_list(Config)-> do_echo([fun(A, B) -> A + B end, fun(A) -> lists:reverse(A) end, fun() -> ok end, - fun fun_roundtrip/1], + fun fun_roundtrip/1, + fun ?MODULE:fun_roundtrip/1], Config). port_roundtrip(doc) -> []; |