diff options
| author | Zandra Norman <[email protected]> | 2017-04-24 11:07:36 +0200 |
|---|---|---|
| committer | Zandra Norman <[email protected]> | 2017-04-24 11:07:36 +0200 |
| commit | 37158d81c8a49d77b8ba32dbc560b3064127e24d (patch) | |
| tree | 43b00d680f459571b2d3d60b874fbdcfdad62eca /lib/stdlib/test/dummy_h.erl | |
| parent | 3ab6bcf6f9a44c998610bdf8863c07fb4f221da9 (diff) | |
| parent | 9e396c8676e5a7eacbe5e7b2d93ee080298eb8fb (diff) | |
| download | otp-37158d81c8a49d77b8ba32dbc560b3064127e24d.tar.gz otp-37158d81c8a49d77b8ba32dbc560b3064127e24d.tar.bz2 otp-37158d81c8a49d77b8ba32dbc560b3064127e24d.zip | |
Merge branch 'zandra/stdlib/optional-callbacks/OTP-13801'
* zandra/stdlib/optional-callbacks/OTP-13801:
wx: make wx_object callbacks optional
stdlib: Make gen_fsm callbacks optional
stdlib: Make gen_event callbacks optional
stdlib: Make gen_server callbacks optional
Diffstat (limited to 'lib/stdlib/test/dummy_h.erl')
| -rw-r--r-- | lib/stdlib/test/dummy_h.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/stdlib/test/dummy_h.erl b/lib/stdlib/test/dummy_h.erl index bc89cb4fde..70c0eafbdf 100644 --- a/lib/stdlib/test/dummy_h.erl +++ b/lib/stdlib/test/dummy_h.erl @@ -26,6 +26,8 @@ init(make_error) -> {error, my_error}; +init({state, State}) -> + {ok, State}; init([Parent]) -> {ok, Parent}; %% We will send special responses for every handled event. init([Parent,hibernate]) -> @@ -83,7 +85,9 @@ terminate(swap, State) -> {ok, State}; terminate({error, {return, faulty}}, Parent) -> Parent ! {dummy_h, returned_error}; +terminate(_Reason, {undef_in_terminate, {Mod, Fun}}) -> + Mod:Fun(), + ok; terminate(_Reason, _State) -> ok. - |