diff options
author | Hans Bolinder <[email protected]> | 2016-02-17 09:30:16 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2016-02-17 09:30:16 +0100 |
commit | 05a24fed7539f861c7d725829acb196a3991923c (patch) | |
tree | d55270dbf9cb24ed868e49a090b52431fb105cd3 /lib/tools/src/cprof.erl | |
parent | 245f3cc7adc063fc131b051a73237a7e9fcf8524 (diff) | |
parent | 0d5820c44dde5875d322a84eab6ce4227fe19bec (diff) | |
download | otp-05a24fed7539f861c7d725829acb196a3991923c.tar.gz otp-05a24fed7539f861c7d725829acb196a3991923c.tar.bz2 otp-05a24fed7539f861c7d725829acb196a3991923c.zip |
Merge branch 'maint'
* maint:
xmerl: Remove 'no_return' Dialyzer warnings
xmerl: Add suppression of Dialyzer warnings
eunit: Add suppression of Dialyzer warnings
debugger: Add suppression of Dialyzer warnings
kernel: Add suppression of Dialyzer warnings
mnesia: Add suppression of Dialyzer warnings
observer: Add suppression of Dialyzer warnings
runtime_tools: Add suppression of Dialyzer warnings
stdlib: Add suppression of Dialyzer warnings
test_server: Add suppression of Dialyzer warnings
tools: Add suppression of Dialyzer warnings
Conflicts:
lib/stdlib/src/erl_lint.erl
lib/stdlib/src/otp_internal.erl
Diffstat (limited to 'lib/tools/src/cprof.erl')
-rw-r--r-- | lib/tools/src/cprof.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/tools/src/cprof.erl b/lib/tools/src/cprof.erl index 0240f876bc..f6d68f0bf8 100644 --- a/lib/tools/src/cprof.erl +++ b/lib/tools/src/cprof.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2009. All Rights Reserved. +%% Copyright Ericsson AB 2002-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -114,6 +114,7 @@ analyse(Limit) when is_integer(Limit) -> analyse(M) when is_atom(M) -> analyse(M, 1). +-dialyzer({no_improper_lists, analyse/2}). analyse(M, Limit) when is_atom(M), is_integer(Limit) -> L0 = [begin MFA = {M,F,A}, |