diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-18 13:59:24 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-18 13:59:24 +0100 |
| commit | b31843c0cdfe31a1a81f5c11b9dd288c120d9da5 (patch) | |
| tree | 9552dc2bd7210a0c6e1a5a597a50fdfc8f33e8c9 /lib/asn1/src/asn1ct_gen_ber_bin_v2.erl | |
| parent | 1c1b36997d766428e8213217d0700d9a5c72de0c (diff) | |
| parent | 71c653f463069d1ab4ddd502a13c4171188253f9 (diff) | |
| download | otp-b31843c0cdfe31a1a81f5c11b9dd288c120d9da5.tar.gz otp-b31843c0cdfe31a1a81f5c11b9dd288c120d9da5.tar.bz2 otp-b31843c0cdfe31a1a81f5c11b9dd288c120d9da5.zip | |
Merge branch 'bjorn/asn1/bug-fixes/OTP-10853'
* bjorn/asn1/bug-fixes/OTP-10853:
asn1ct: Eliminate use of obsolete size/1
Eliminate use of obsolete size/1 in generated code
BER: Fix broken table constraints inside a SET OF/SEQUENCE OF
Smoke test the 'der' option
der: Correct code generation for checking of empty sets
per,uper: Fix breakage of compilation of InformationFramework
Add NullTest
asn1_SUITE: Shorten the path to case-specific directory
asn1_SUITE: Don't add priv_dir to the code path
asn1 tests: Remove obsolete duplicates of ASN.1 specs
Diffstat (limited to 'lib/asn1/src/asn1ct_gen_ber_bin_v2.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_gen_ber_bin_v2.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl index f3a2486565..de0adef2b2 100644 --- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl +++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl @@ -1162,7 +1162,7 @@ gen_objset_enc(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName, emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}), emit({indent(3),"fun(_, Val, _RestPrimFieldName) ->",nl}), emit({indent(6),"Len = case Val of",nl,indent(9), - "Bin when is_binary(Bin) -> size(Bin);",nl,indent(9), + "Bin when is_binary(Bin) -> byte_size(Bin);",nl,indent(9), "_ -> length(Val)",nl,indent(6),"end,"}), emit({indent(6),"{Val,Len}",nl}), emit({indent(3),"end.",nl,nl}), @@ -1270,7 +1270,7 @@ gen_inlined_enc_funs1(Fields,[{typefield,Name,_}|Rest],ObjSetName, %% treatment. emit([";",nl,indent(9),{asis,Name}," ->",nl]), emit([indent(12),"Len = case Val of",nl, - indent(15),"Bin when is_binary(Bin) -> size(Bin);",nl, + indent(15),"Bin when is_binary(Bin) -> byte_size(Bin);",nl, indent(15),"_ -> length(Val)",nl,indent(12),"end,",nl, indent(12),"{Val,Len}"]), {Acc,0} @@ -1449,7 +1449,7 @@ gen_inlined_dec_funs(Fields,[{typefield,Name,Prop}|Rest], nl,indent(6),"case Type of",nl, indent(9),{asis,Name}," ->",nl, indent(12),"Len = case Bytes of",nl, - indent(15),"B when is_binary(B) -> size(B);",nl, + indent(15),"B when is_binary(B) -> byte_size(B);",nl, indent(15),"_ -> length(Bytes)",nl, indent(12),"end,",nl, indent(12),"{Bytes,[],Len}"]), |