[Rcpp-commits] r4408 - in pkg/RcppClassic: . src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2013-07-27 13:59:22 +0200 (Sat, 27 Jul 2013)
New Revision: 4408

Modified:
   pkg/RcppClassic/ChangeLog
   pkg/RcppClassic/DESCRIPTION
   pkg/RcppClassic/src/RcppFunction.cpp
Log:
DESCRIPTION: Release 0.9.4
passing an env, not NULL, to eval() as requested by BDR


Modified: pkg/RcppClassic/ChangeLog
===================================================================
--- pkg/RcppClassic/ChangeLog	2013-07-25 09:50:41 UTC (rev 4407)
+++ pkg/RcppClassic/ChangeLog	2013-07-27 11:59:22 UTC (rev 4408)
@@ -1,3 +1,10 @@
+2013-07-27  Dirk Eddelbuettel  <edd at debian.org>
+
+	* DESCRIPTION: Release 0.9.4
+
+	* src/RcppFunction.cpp: In Rf_eval() ensure second argument is an
+	environment as per request by Brian Ripley
+
 2012-12-21  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.9.3

Modified: pkg/RcppClassic/DESCRIPTION
===================================================================
--- pkg/RcppClassic/DESCRIPTION	2013-07-25 09:50:41 UTC (rev 4407)
+++ pkg/RcppClassic/DESCRIPTION	2013-07-27 11:59:22 UTC (rev 4408)
@@ -1,6 +1,6 @@
 Package: RcppClassic
 Title: Deprecated 'classic' Rcpp API 
-Version: 0.9.3
+Version: 0.9.4
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions by David Reiss,
  and based on code written during 2005 and 2006 by Dominick Samperi

Modified: pkg/RcppClassic/src/RcppFunction.cpp
===================================================================
--- pkg/RcppClassic/src/RcppFunction.cpp	2013-07-25 09:50:41 UTC (rev 4407)
+++ pkg/RcppClassic/src/RcppFunction.cpp	2013-07-27 11:59:22 UTC (rev 4408)
@@ -3,7 +3,7 @@
 // RcppFunction.cpp: RcppClassic R/C++ interface class library -- function support
 //
 // Copyright (C) 2005 - 2006 Dominick Samperi
-// Copyright (C) 2008 - 2009 Dirk Eddelbuettel
+// Copyright (C) 2008 - 2013 Dirk Eddelbuettel
 //
 // This file is part of RcppClassic.
 //
@@ -49,7 +49,7 @@
     PROTECT(R_fcall = Rf_lang2(fn, R_NilValue));
     numProtected++;
     SETCADR(R_fcall, listArg);
-    SEXP result = Rf_eval(R_fcall, R_NilValue);
+    SEXP result = Rf_eval(R_fcall, R_EmptyEnv);
     names.clear();
     listSize = currListPosn = 0; // Ready for next call.
     return result;
@@ -62,7 +62,7 @@
     PROTECT(R_fcall = Rf_lang2(fn, R_NilValue));
     numProtected++;
     SETCADR(R_fcall, vectorArg);
-    SEXP result = Rf_eval(R_fcall, R_NilValue);
+    SEXP result = Rf_eval(R_fcall, R_EmptyEnv);
     vectorArg = R_NilValue; // Ready for next call.
     return result;
 }