Skip to content

Commit b7391e2

Browse files
author
hornik
committed
Tweaks for c80832.
git-svn-id: https://svn.r-project.org/R/trunk@88300 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 4641bf7 commit b7391e2

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/library/utils/R/unix/sysutils.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
memory.size <- function(max = FALSE)
2020
{
21-
warning("'memory.size()' is Windows-specific", call.=FALSE)
21+
warning("'memory.size()' is no longer supported", call.=FALSE)
2222
Inf
2323
}
2424

2525
memory.limit <- function(size = NA)
2626
{
27-
warning("'memory.limit()' is Windows-specific", call.=FALSE)
28-
Inf
27+
warning("'memory.limit()' is no longer supported", call.=FALSE)
28+
Inf
2929
}

src/library/utils/man/memory.size.Rd

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,15 @@ memory.size(max = FALSE)
2020
2121
memory.limit(size = NA)
2222
}
23+
\arguments{
24+
\item{max}{unused.}
25+
% Was
26+
% \item{max}{logical. If true the maximum amount of memory obtained from
27+
% the OS is reported, otherwise the amount currently in use.}
28+
\item{size}{unused.}
29+
% Was
30+
% \item{size}{numeric. If \code{NA} report the memory size, otherwise
31+
% request a new limit, in Mb.}
32+
}
2333
\keyword{utilities}
2434
\keyword{internal}

0 commit comments

Comments
 (0)