aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2015-05-08 08:18:27 +0200
committerLars Thorsen <[email protected]>2015-05-08 08:18:27 +0200
commit74b7468ae660a4eeba8a20d9f917832021b7efbb (patch)
tree6e7d74fa687f8f393f87c4167cf719c9a95451a7
parent2d0a8355e2eb2a322a72d0fa9e396113a222b196 (diff)
parent1cba67b828afb24e5c1917957a384bce984254a5 (diff)
downloadotp-74b7468ae660a4eeba8a20d9f917832021b7efbb.tar.gz
otp-74b7468ae660a4eeba8a20d9f917832021b7efbb.tar.bz2
otp-74b7468ae660a4eeba8a20d9f917832021b7efbb.zip
Merge branch 'lars/xmerl/fix-warnings/OTP-12689'
* lars/xmerl/fix-warnings/OTP-12689: [xmerl] Fix compiler warnings
-rw-r--r--lib/xmerl/src/xmerl.erl2
-rw-r--r--lib/xmerl/vsn.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/xmerl/src/xmerl.erl b/lib/xmerl/src/xmerl.erl
index 01af183eef..88eaefc492 100644
--- a/lib/xmerl/src/xmerl.erl
+++ b/lib/xmerl/src/xmerl.erl
@@ -313,7 +313,7 @@ apply_cb([M|Ms], F, Df, Args, A, Ms0) ->
true -> apply(M, F, Args);
false -> apply_cb(Ms, F, Df, Args, A, Ms0)
end;
-apply_cb([], Df, Df, Args, A, _Ms0) ->
+apply_cb([], Df, Df, Args, _A, _Ms0) ->
exit({unknown_tag, {Df, Args}});
apply_cb([], F, Df, Args, A, Ms0) ->
apply_cb(Ms0, Df, Df, [F|Args], A+1).
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index aab2a37d6c..1ed230316f 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.7
+XMERL_VSN = 1.3.8