diff options
author | Björn-Egil Dahlberg <[email protected]> | 2011-09-19 09:42:57 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2011-09-19 09:42:57 +0200 |
commit | 87288e173f09d573460a06d98466f84cba8f4b5c (patch) | |
tree | 2e0949deb7bc6c27e58feb870458dc1583cd4e07 /lib/gs/contribs/cols/cols.erl | |
parent | adbad8f580825761238c647e181a07678f07d361 (diff) | |
parent | 2d13b9580f405541e46491743702eaaedf3f6e91 (diff) | |
download | otp-87288e173f09d573460a06d98466f84cba8f4b5c.tar.gz otp-87288e173f09d573460a06d98466f84cba8f4b5c.tar.bz2 otp-87288e173f09d573460a06d98466f84cba8f4b5c.zip |
Merge branch 'dev' into major
* dev:
gs: Update to modern type guards in examples
os_mon: Check results from fgets in cpu_sup
erts: Remove compiler warning in sys.c
Diffstat (limited to 'lib/gs/contribs/cols/cols.erl')
-rw-r--r-- | lib/gs/contribs/cols/cols.erl | 4 |
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; |