aboutsummaryrefslogtreecommitdiffstats
path: root/lib/gs/contribs/cols/cols.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-19 19:26:54 +0200
committerMicael Karlberg <[email protected]>2011-09-19 19:26:54 +0200
commit7c730a573a7e239f41bc619b024a675667767428 (patch)
tree1265ca1ddae47b094af21f669d0526c9c1b074dd /lib/gs/contribs/cols/cols.erl
parent13fcdd5c954ddbb8ac9401d73f8e77423fbd976c (diff)
parente84f232326b2800ca806c867b2bfbe3652d423cb (diff)
downloadotp-7c730a573a7e239f41bc619b024a675667767428.tar.gz
otp-7c730a573a7e239f41bc619b024a675667767428.tar.bz2
otp-7c730a573a7e239f41bc619b024a675667767428.zip
Merge branch 'dev' of super:otp into bmk/inets/inets571_integration
Diffstat (limited to 'lib/gs/contribs/cols/cols.erl')
-rw-r--r--lib/gs/contribs/cols/cols.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gs/contribs/cols/cols.erl b/lib/gs/contribs/cols/cols.erl
index 67b46d0dfb..439eb717f7 100644
--- a/lib/gs/contribs/cols/cols.erl
+++ b/lib/gs/contribs/cols/cols.erl
@@ -278,7 +278,7 @@ fall_column([], _X, _Y, ColumnAcc, ChecksAcc) ->
fall_column([black|Colors], X, Y, ColumnAcc, ChecksAcc) ->
case find_box(Colors) of
false -> {ColumnAcc, ChecksAcc};
- NewColors when list(NewColors) ->
+ NewColors when is_list(NewColors) ->
fall_one_step(NewColors, X, Y, ColumnAcc, ChecksAcc)
end;
fall_column([Color|Colors], X, Y, ColumnAcc, ChecksAcc) ->
@@ -330,7 +330,7 @@ new_column_list([], _, _) -> [].
%%----------------------------------------------------------------------
%% Returns: a reversed list of colors.
%%----------------------------------------------------------------------
-columntuple_to_list(ColumnTuple) when tuple(ColumnTuple) ->
+columntuple_to_list(ColumnTuple) when is_tuple(ColumnTuple) ->
columntuple_to_list(tuple_to_list(ColumnTuple),[]).
columntuple_to_list([],Acc) -> Acc;