diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-01-04 18:23:38 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-01-04 18:23:38 +0100 |
| commit | f9ca630a95e1e2adb1b225bfb69e3101678183f3 (patch) | |
| tree | f40c9b82bf851b7efdb9aaa88406747f60cb4822 /lib/orber | |
| parent | 195be9a44f2481b9c575c8ad286f4d2278b831b3 (diff) | |
| parent | d79b413adcf4c084df30f831486ba1f1ac504c5c (diff) | |
| download | otp-f9ca630a95e1e2adb1b225bfb69e3101678183f3.tar.gz otp-f9ca630a95e1e2adb1b225bfb69e3101678183f3.tar.bz2 otp-f9ca630a95e1e2adb1b225bfb69e3101678183f3.zip | |
Merge branch 'egil/fix-compiler-warnings' into maint
* egil/fix-compiler-warnings:
erts: Use re instead of regexp in testsuite
erts: Remove unused code in testsuites
orber: Use modern list guard in testsuite
orber: Ignore unused variable in orber_tb.erl
xmerl: Ignore unused variable in xmerl_uri.erl
syntax_tool: Add missing type information
hipe: Suppress warnings for unused variables
hipe: Add type information to cfg_info record
tools: Use literal formatting in erl_memory.c
asn1: Remove unused variable in asn1_erl_nif.c
ei: Remove unused variable in ei_format.c
erts: Add missing prototype to DRIVER_INIT
runtime_tools: Fix signedness in trace_ip_drv.c
to_erl: Remove compiler warnings
heart: Suppress compiler warnings
erts: Remove compiler warnings in inet_gethost.c
erts: Remove dead code in inet_gethost.c
erts: Remove dead code
Diffstat (limited to 'lib/orber')
| -rw-r--r-- | lib/orber/src/orber_tb.erl | 2 | ||||
| -rw-r--r-- | lib/orber/test/orber_acl_SUITE.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/orber/src/orber_tb.erl b/lib/orber/src/orber_tb.erl index eee67296d7..d3e3a8497d 100644 --- a/lib/orber/src/orber_tb.erl +++ b/lib/orber/src/orber_tb.erl @@ -209,7 +209,7 @@ check_illegal_tcp_options([binary |T], IllegalOpts) -> check_illegal_tcp_options(T,[binary |IllegalOpts]); check_illegal_tcp_options([{reuseaddr, V} |T], IllegalOpts) -> check_illegal_tcp_options(T,[{reuseaddr, V} |IllegalOpts]); -check_illegal_tcp_options([H|T], IllegalOpts) -> +check_illegal_tcp_options([_H|T], IllegalOpts) -> check_illegal_tcp_options(T, IllegalOpts). %%---------------------------------------------------------------------- diff --git a/lib/orber/test/orber_acl_SUITE.erl b/lib/orber/test/orber_acl_SUITE.erl index b43a00be19..49107cde84 100644 --- a/lib/orber/test/orber_acl_SUITE.erl +++ b/lib/orber/test/orber_acl_SUITE.erl @@ -80,7 +80,7 @@ end_per_group(_GroupName, Config) -> %%----------------------------------------------------------------- init_per_suite(Config) -> if - list(Config) -> + is_list(Config) -> Config; true -> exit("Config not a list") |