Changeset: 515f8dc2595a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=515f8dc2595a
Modified Files:
clients/R/Tests/install.R
monetdb5/extras/rapi/rapi.c
Branch: embedded
Log Message:
come on, gcc
diffs (32 lines):
diff --git a/clients/R/Tests/install.R b/clients/R/Tests/install.R
--- a/clients/R/Tests/install.R
+++ b/clients/R/Tests/install.R
@@ -7,8 +7,8 @@ if (basedir == "" || srcdir == "") {
builddir <- file.path(basedir, "rbuilddir")
installdir <- file.path(basedir, "rlibdir")
dir.create(builddir)
+if (file.exists(installdir)) unlink(installdir, recursive=T)
dir.create(installdir)
-file.remove(file.path(builddir, "MonetDB.R"), recursive=T, showWarnings=F)
file.copy(from=file.path(srcdir, "..", "MonetDB.R"), to=builddir, recursive=T)
dd <- capture.output(suppressMessages( {
sink(file=file(tempfile(), open = "wt"), type = "message")
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -329,7 +329,6 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
size_t pos;
char* rcall;
size_t rcalllen;
- size_t ret_rows = 0;
int ret_cols = 0; /* int because pci->retc is int, too*/
str *args;
int evalErr;
@@ -490,7 +489,6 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
// ret should be a data frame with exactly as many columns as we need
from retc
ret_cols = LENGTH(retval);
- ret_rows = LENGTH(VECTOR_ELT(retval, 0));
if (ret_cols != pci->retc) {
msg = createException(MAL, "rapi.eval",
"Expected result of
%d columns, got %d", pci->retc, ret_cols);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
