Skip to content

Commit 9e7df18

Browse files
author
maechler
committed
StringFromLogical() w/o warn
git-svn-id: https://svn.r-project.org/R/trunk@88148 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent fe0ef1c commit 9e7df18

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/include/Defn.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,7 @@ int Rf_LogicalFromString(SEXP, int*);
19571957
int Rf_IntegerFromString(SEXP, int*);
19581958
double Rf_RealFromString(SEXP, int*);
19591959
Rcomplex Rf_ComplexFromString(SEXP, int*);
1960-
SEXP Rf_StringFromLogical(int, int*);
1960+
SEXP Rf_StringFromLogical(int);
19611961
SEXP Rf_StringFromInteger(int, int*);
19621962
SEXP Rf_StringFromReal(double, int*);
19631963
SEXP Rf_StringFromComplex(Rcomplex, int*);

src/main/coerce.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ attribute_hidden Rcomplex ComplexFromString(SEXP x, int *warn)
296296
}
297297

298298

299-
attribute_hidden SEXP StringFromLogical(int x, int *warn)
299+
attribute_hidden SEXP StringFromLogical(int x)
300300
{
301301
static SEXP lglcache = NULL;
302302
if (x == NA_LOGICAL) return NA_STRING;
@@ -423,7 +423,7 @@ static SEXP coerceToSymbol(SEXP v)
423423
PROTECT(v);
424424
switch(TYPEOF(v)) {
425425
case LGLSXP:
426-
ans = StringFromLogical(LOGICAL_ELT(v, 0), &warn);
426+
ans = StringFromLogical(LOGICAL_ELT(v, 0));
427427
break;
428428
case INTSXP:
429429
ans = StringFromInteger(INTEGER_ELT(v, 0), &warn);
@@ -759,7 +759,7 @@ static SEXP coerceToString(SEXP v)
759759
case LGLSXP:
760760
for (i = 0; i < n; i++) {
761761
// if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
762-
SET_STRING_ELT(ans, i, StringFromLogical(LOGICAL_ELT(v, i), &warn));
762+
SET_STRING_ELT(ans, i, StringFromLogical(LOGICAL_ELT(v, i)));
763763
}
764764
break;
765765
case INTSXP:

0 commit comments

Comments
 (0)