3 files changed, 8 insertions, 6 deletions
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 83d12600b7..321980e5e4 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -1576,13 +1576,15 @@ printable_string_1(#'Externalvaluereference'{value=Type}) ->
 printable_string_1({Atom,Line}) when is_atom(Atom), is_integer(Line) ->
     q(Atom);
 printable_string_1({object,definedsyntax,L}) ->
-    q(string:join([printable_string_1(Item) || Item <- L], " "));
+    Str = lists:join($\s, [printable_string_1(Item) || Item <- L]),
+    q(lists:flatten(Str));
 printable_string_1([_|_]=Def) ->
     case lists:all(fun is_integer/1, Def) of
 	true ->
 	    lists:flatten(io_lib:format("~p", [Def]));
 	false ->
-	    q(string:join([printable_string_1(Item) || Item <- Def], " "))
+            Str = lists:join($\s, [printable_string_1(Item) || Item <- Def]),
+            q(lists:flatten(Str))
     end;
 printable_string_1(Def) ->
     lists:flatten(io_lib:format("~p", [Def])).
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index da9f6ac559..efbc6d6380 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -811,7 +811,7 @@ result_line(NoOkWrapper, Items) ->
 result_line_1([SingleItem]) ->
     SingleItem;
 result_line_1(Items) ->
-    ["{",string:join(Items, ","),"}"].
+    ["{",lists:join(",",Items),"}"].
 
 try_catch() ->
     ["  catch",nl,
@@ -958,7 +958,7 @@ open_hrl(OutFile,Module) ->
 
 hrl_protector(OutFile) ->
     BaseName = filename:basename(OutFile),
-    P = "_" ++ string:to_upper(BaseName) ++ "_HRL_",
+    P = "_" ++ string:uppercase(BaseName) ++ "_HRL_",
     [if
 	 $A =< C, C =< $Z -> C;
 	 $a =< C, C =< $a -> C;
diff --git a/lib/asn1/src/asn1rtt_real_common.erl b/lib/asn1/src/asn1rtt_real_common.erl
index 3a79209015..81c1f54d74 100644
--- a/lib/asn1/src/asn1rtt_real_common.erl
+++ b/lib/asn1/src/asn1rtt_real_common.erl
@@ -125,7 +125,7 @@ encode_real(_C, {_,Base,_}) ->
 encode_real(C, Real) when is_list(Real) ->
     %% The Real string may come in as a NR1, NR2 or NR3 string.
     {Mantissa, Exponent} =
-	case string:tokens(Real,"Ee") of
+	case string:lexemes(Real,"Ee") of
 	    [NR2] ->
 		{NR2,0};
 	    [NR3MB,NR3E] ->
@@ -144,7 +144,7 @@ encode_real(C, Real) when is_list(Real) ->
 		NewMan = remove_trailing_zeros(Dec),
 		{NewMan,length(ZeroDecimal(NewMan))};
 	    _ ->
-		case string:tokens(Mantissa,",.") of
+		case string:lexemes(Mantissa,",.") of
 		    [Num] -> %% No decimal-mark
 			{integer_to_list(list_to_integer(Num)),0};
 		    [Num,Dec] ->