diff options
| author | Marcus Arendt <[email protected]> | 2014-09-19 10:32:02 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-09-19 10:32:02 +0200 |
| commit | 3c5b487d925ced4314d5df0172bf33d93920c4d9 (patch) | |
| tree | 84605f890c560a6d0be04d48db6e89541c92b809 /lib | |
| parent | 86b7cf42011302a78cb73ec4f339a2b31af8ae9a (diff) | |
| parent | ff47482c9acb9b0655d1d9528164c96aff05cc90 (diff) | |
| download | otp-3c5b487d925ced4314d5df0172bf33d93920c4d9.tar.gz otp-3c5b487d925ced4314d5df0172bf33d93920c4d9.tar.bz2 otp-3c5b487d925ced4314d5df0172bf33d93920c4d9.zip | |
Merge branch 'nox/rm-generic_debug/OTP-12183'
* nox/rm-generic_debug/OTP-12183:
Remove untested option 'generic_debug' from gen_server
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/gen_server.erl | 16 | ||||
| -rw-r--r-- | lib/wx/src/wx_object.erl | 16 |
2 files changed, 4 insertions, 28 deletions
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl index 27b34b05a9..2d8d7f6233 100644 --- a/lib/stdlib/src/gen_server.erl +++ b/lib/stdlib/src/gen_server.erl @@ -803,22 +803,10 @@ opt(_, []) -> debug_options(Name, Opts) -> case opt(debug, Opts) of - {ok, Options} -> dbg_options(Name, Options); - _ -> dbg_options(Name, []) + {ok, Options} -> dbg_opts(Name, Options); + _ -> [] end. -dbg_options(Name, []) -> - Opts = - case init:get_argument(generic_debug) of - error -> - []; - _ -> - [log, statistics] - end, - dbg_opts(Name, Opts); -dbg_options(Name, Opts) -> - dbg_opts(Name, Opts). - dbg_opts(Name, Opts) -> case catch sys:debug_options(Opts) of {'EXIT',_} -> diff --git a/lib/wx/src/wx_object.erl b/lib/wx/src/wx_object.erl index 249ea1cee3..2c016e7951 100644 --- a/lib/wx/src/wx_object.erl +++ b/lib/wx/src/wx_object.erl @@ -600,22 +600,10 @@ opt(_, []) -> %% @hidden debug_options(Name, Opts) -> case opt(debug, Opts) of - {ok, Options} -> dbg_options(Name, Options); - _ -> dbg_options(Name, []) + {ok, Options} -> dbg_opts(Name, Options); + _ -> [] end. %% @hidden -dbg_options(Name, []) -> - Opts = - case init:get_argument(generic_debug) of - error -> - []; - _ -> - [log, statistics] - end, - dbg_opts(Name, Opts); -dbg_options(Name, Opts) -> - dbg_opts(Name, Opts). -%% @hidden dbg_opts(Name, Opts) -> case catch sys:debug_options(Opts) of {'EXIT',_} -> |