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_per_rt2ct.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_per_rt2ct.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_gen_per_rt2ct.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl index 5a409295fb..81d8cdcae6 100644 --- a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl +++ b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl @@ -610,9 +610,9 @@ gen_encode_objectfields(Erules,ClassName,[{typefield,Name,OptOrMand}|Rest], emit([" if",nl, " is_list(Val) ->",nl, " NewVal = list_to_binary(Val),",nl, - " [20,size(NewVal),NewVal];",nl, + " [20,byte_size(NewVal),NewVal];",nl, " is_binary(Val) ->",nl, - " [20,size(Val),Val]",nl, + " [20,byte_size(Val),Val]",nl, " end"]), []; {false,{'DEFAULT',DefaultType}} -> @@ -989,7 +989,7 @@ gen_objset_enc(_Erule,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName, emit({indent(9),"is_list(Val) -> list_to_binary(Val);",nl}), emit({indent(9),"true -> Val",nl}), emit({indent(6),"end,",nl}), - emit({indent(6),"Size = size(BinVal),",nl}), + emit({indent(6),"Size = byte_size(BinVal),",nl}), emit({indent(6),"if",nl}), emit({indent(9),"Size < 256 ->",nl}), emit({indent(12),"[20,Size,BinVal];",nl}), |