Skip to content

Commit 0c268e0

Browse files
more vestiges
1 parent dc303d2 commit 0c268e0

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

R/data.table.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2919,10 +2919,10 @@ setDT = function(x, keep.rownames=FALSE, key=NULL, check.names=FALSE) {
29192919
# check no matrix-like columns, #3760. Allow a single list(matrix) is unambiguous and depended on by some revdeps, #3581
29202920
# for performance, only warn on the first such column, #5426
29212921
for (jj in seq_along(x)) {
2922-
if (test_posixl_column && inherits(x[[jj]], "POSIXlt")) {
2922+
if (inherits(x[[jj]], "POSIXlt")) {
29232923
.Call(Cerr_posixl_column_r, jj)
29242924
}
2925-
if (test_matrix_column && length(dim(x[[jj]])) > 1L) {
2925+
if (length(dim(x[[jj]])) > 1L) {
29262926
.Call(Cwarn_matrix_column_r, jj)
29272927
break
29282928
}

src/assign.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,8 @@ SEXP setdt_nrows(SEXP x)
220220
* e.g. in package eplusr which calls setDT on a list when parsing JSON. Operations which
221221
* fail for NULL columns will give helpful error at that point, #3480 and #3471 */
222222
if (Rf_isNull(xi)) continue;
223-
if (test_posixl_cols && Rf_inherits(xi, "POSIXlt")) {
224-
warn_posixl_column(i+1);
225-
test_posixl_cols = false;
223+
if (Rf_inherits(xi, "POSIXlt")) {
224+
err_posixl_column(i+1);
226225
}
227226
SEXP dim_xi = getAttrib(xi, R_DimSymbol);
228227
R_len_t len_xi;

0 commit comments

Comments
 (0)