aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-02-15 12:06:12 +0100
committerBjörn Gustavsson <[email protected]>2016-02-15 12:06:12 +0100
commit3dc9720902b9911d6fced24b369a6e5b670b87b5 (patch)
tree1f17be9f21ed67ecb6e9918419d994563c38774c
parentcf99bf2de73be06e0f0d597dc72e3d7df1ed5f90 (diff)
parent84818479ea74a7084169f415b9253aa2ff6af69d (diff)
downloadotp-3dc9720902b9911d6fced24b369a6e5b670b87b5.tar.gz
otp-3dc9720902b9911d6fced24b369a6e5b670b87b5.tar.bz2
otp-3dc9720902b9911d6fced24b369a6e5b670b87b5.zip
Merge branch 'maint'
* maint: asn1: Suppress warnings for improper lists in generated code
-rw-r--r--lib/asn1/src/asn1ct_gen.erl1
-rw-r--r--lib/asn1/test/asn1_test_lib.erl2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index 093bcb5a6c..6d5062a118 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -1289,6 +1289,7 @@ gen_head(Erules,Mod,Hrl) ->
emit({"-module('",Mod,"').",nl}),
put(currmod,Mod),
emit({"-compile(nowarn_unused_vars).",nl}),
+ emit({"-dialyzer(no_improper_lists).",nl}),
case Hrl of
0 -> ok;
_ -> emit({"-include(\"",Mod,".hrl\").",nl})
diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl
index 4fee5a64cc..ae2e5641ec 100644
--- a/lib/asn1/test/asn1_test_lib.erl
+++ b/lib/asn1/test/asn1_test_lib.erl
@@ -58,7 +58,7 @@ dialyze(Files) ->
Beams0 = [code:which(module(F)) || F <- Files],
Beams = [code:which(asn1rt_nif)|Beams0],
case dialyzer:run([{files,Beams},
- {warnings,[no_improper_lists]},
+ {warnings,[]},
{get_warnings,true}]) of
[] ->
ok;