View | Details | Raw Unified | Return to bug 16490 | Differences between
and this patch

Collapse All | Expand All

(-)src/library/base/R/namespace.R (-1 / +1 lines)
Lines 990-996 Link Here
990
                 call. = FALSE, domain = NA)
990
                 call. = FALSE, domain = NA)
991
        }
991
        }
992
    }
992
    }
993
    expnames <- unlist(lapply(expnames, get, envir = exports, inherits = FALSE))
993
    expnames <- unlist(mget(expnames, envir = exports, inherits = FALSE), recursive=FALSE)
994
    if (is.null(impnames)) impnames <- character()
994
    if (is.null(impnames)) impnames <- character()
995
    if (is.null(expnames)) expnames <- character()
995
    if (is.null(expnames)) expnames <- character()
996
    .Internal(importIntoEnv(impenv, impnames, expenv, expnames))
996
    .Internal(importIntoEnv(impenv, impnames, expenv, expnames))
(-)src/library/methods/R/is.R (-1 / +1 lines)
Lines 76-82 Link Here
76
        ext <- classDef1@contains
76
        ext <- classDef1@contains
77
        if(!identical(maybe, TRUE) && length(ext) > 0)
77
        if(!identical(maybe, TRUE) && length(ext) > 0)
78
        {
78
        {
79
            noTest <- sapply(ext, function(obj)identical(body(obj@test), TRUE))
79
            noTest <- vapply(ext, function(obj)identical(body(obj@test), TRUE), logical(1))
80
            ext <- ext[noTest]
80
            ext <- ext[noTest]
81
        }
81
        }
82
        if(fullInfo) {
82
        if(fullInfo) {
(-)src/library/methods/src/methods_list_dispatch.c (-1 / +1 lines)
Lines 845-851 Link Here
845
{
845
{
846
    if(TYPEOF(e1) == STRSXP && TYPEOF(e2) == STRSXP &&
846
    if(TYPEOF(e1) == STRSXP && TYPEOF(e2) == STRSXP &&
847
       LENGTH(e1) == 1 && LENGTH(e2) == 1 &&
847
       LENGTH(e1) == 1 && LENGTH(e2) == 1 &&
848
       streql(CHAR(STRING_ELT(e1, 0)), CHAR(STRING_ELT(e2, 0))))
848
       STRING_ELT(e1, 0) == STRING_ELT(e2, 0))
849
	return R_TRUE;
849
	return R_TRUE;
850
    else
850
    else
851
	return R_FALSE;
851
	return R_FALSE;

Return to bug 16490