aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-01-23 14:15:37 +0100
committerHenrik Nord <[email protected]>2014-01-23 14:15:40 +0100
commit12e24220c078750da1acb71d720218295e5d16b8 (patch)
tree03e41fd4bf70f5dec1856d1187516bfaf61a5ce7 /erts
parentfb60686855fdc3285c559e21427481f07f8f129e (diff)
parent66b16c23552418c17a29caf7cecf8e11f587b29d (diff)
downloadotp-12e24220c078750da1acb71d720218295e5d16b8.tar.gz
otp-12e24220c078750da1acb71d720218295e5d16b8.tar.bz2
otp-12e24220c078750da1acb71d720218295e5d16b8.zip
Merge branch 'vinoski/system-flag-warn-msg'
* vinoski/system-flag-warn-msg: fix system_flag deprecation warnings OTP-11602
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/bif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 96666d98ed..61c1abedb5 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -4488,7 +4488,7 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
BIF_P->group_leader,
"A call to erlang:system_flag(cpu_topology, _) was made.\n"
"The cpu_topology argument is deprecated and scheduled\n"
- "for removal in erts-5.10/OTP-R16. For more information\n"
+ "for removal in Erlang/OTP 18. For more information\n"
"see the erlang:system_flag/2 documentation.\n");
BIF_TRAP1(set_cpu_topology_trap, BIF_P, BIF_ARG_2);
} else if (ERTS_IS_ATOM_STR("scheduler_bind_type", BIF_ARG_1)) {
@@ -4496,7 +4496,7 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
BIF_P->group_leader,
"A call to erlang:system_flag(scheduler_bind_type, _) was\n"
"made. The scheduler_bind_type argument is deprecated and\n"
- "scheduled for removal in erts-5.10/OTP-R16. For more\n"
+ "scheduled for removal in Erlang/OTP 18. For more\n"
"information see the erlang:system_flag/2 documentation.\n");
return erts_bind_schedulers(BIF_P, BIF_ARG_2);
}