aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-05-08 12:13:57 +0200
committerBjörn Gustavsson <[email protected]>2015-05-08 12:13:57 +0200
commit52ecefa58e47b0a86d814152608ec23c4147fa1f (patch)
tree20b51d1e41dea1972cad88108e34f1844c88bbee
parent0bdb747b4b0572bfe30bf7d974e32d05c0e2df66 (diff)
parentf1484e1bd971d75bb232bc4f50d25473e1046e65 (diff)
downloadotp-52ecefa58e47b0a86d814152608ec23c4147fa1f.tar.gz
otp-52ecefa58e47b0a86d814152608ec23c4147fa1f.tar.bz2
otp-52ecefa58e47b0a86d814152608ec23c4147fa1f.zip
Merge branch 'bjorn/kernel/code-loading'
* bjorn/kernel/code-loading: code: Make load_native_code_for_all_loaded/0 comply to spec
-rw-r--r--lib/kernel/src/code.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index a8cbdf9667..d73d1ff281 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -564,7 +564,8 @@ load_native_code_for_all_loaded() ->
catch
_:_ ->
ok
- end.
+ end,
+ ok.
load_all_native(Loaded, ChunkTag) ->
catch load_all_native_1(Loaded, ChunkTag).