diff options
| author | Hans Bolinder <[email protected]> | 2016-02-17 09:19:08 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-02-17 09:19:08 +0100 |
| commit | 0d5820c44dde5875d322a84eab6ce4227fe19bec (patch) | |
| tree | 1b25d01a0c7cc5dc53f89dcbbf7a5eb891b5d7a6 /lib/observer/src/observer_tv_table.erl | |
| parent | f6743c5263b67013951f36e56d942d7d89ba8ba2 (diff) | |
| parent | 3270b7f32c71bf8f7637a61a09dd0e9a2dbfc8d1 (diff) | |
| download | otp-0d5820c44dde5875d322a84eab6ce4227fe19bec.tar.gz otp-0d5820c44dde5875d322a84eab6ce4227fe19bec.tar.bz2 otp-0d5820c44dde5875d322a84eab6ce4227fe19bec.zip | |
Merge branch 'hb/add_dialyzer_suppressions/OTP-12862' into maint
* hb/add_dialyzer_suppressions/OTP-12862:
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
Diffstat (limited to 'lib/observer/src/observer_tv_table.erl')
| -rw-r--r-- | lib/observer/src/observer_tv_table.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl index 88f606b3e4..75e6919642 100644 --- a/lib/observer/src/observer_tv_table.erl +++ b/lib/observer/src/observer_tv_table.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2011-2014. All Rights Reserved. +%% Copyright Ericsson AB 2011-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. @@ -669,6 +669,7 @@ merge([], New, _Key) -> merge(Old, New, Key) -> merge2(keysort(Key, Old), keysort(Key, New), Key). +-dialyzer({no_improper_lists, merge2/3}). merge2([[Obj|_]|Old], [Obj|New], Key) -> [[Obj]|merge2(Old, New, Key)]; merge2([[A|Op]|Old], [B|New], Key) |