diff options
| author | Siri Hansen <[email protected]> | 2014-11-06 14:48:36 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-11-06 14:48:36 +0100 |
| commit | eeba41c3f9a56948d62de66065851f509ae02b43 (patch) | |
| tree | c73dd9ceb2fbd71e5c0a6713715b7a4df56838db /lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl | |
| parent | 5349afa77f6daca3525ed1b5e1081c5379a4ca65 (diff) | |
| parent | d69c45710f1beb570151dd6e2d35d6a3925d9029 (diff) | |
| download | otp-eeba41c3f9a56948d62de66065851f509ae02b43.tar.gz otp-eeba41c3f9a56948d62de66065851f509ae02b43.tar.bz2 otp-eeba41c3f9a56948d62de66065851f509ae02b43.zip | |
Merge branch 'siri/sup-spec-maps/OTP-11043'
* siri/sup-spec-maps/OTP-11043:
Update emacs skeleton for supervisor to use maps
Update dialyzer test with maps in supervisor properties
Add documentation of maps in supervisor flags and child specs
Add test of maps in supervisor flags and child specs
New function supervisor:get_childspec/2
Allow maps for supervisor flags and child specs
Rebase supervisor
Add more tests of supervisor
Diffstat (limited to 'lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl')
| -rw-r--r-- | lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl b/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl index 76da1fda70..401ee88eab 100644 --- a/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl +++ b/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl @@ -13,7 +13,7 @@ -export([init/1]). -spec init(atom()) -> - {ok, {{supervisor:strategy(), non_neg_integer(), non_neg_integer()}, + {ok, {{supervisor:strategy(), non_neg_integer(), pos_integer()}, [supervisor:child_spec()]}} | ignore. init(StorageName) -> |