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

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

Author: edd
Date: 2014-01-23 16:18:09 +0100 (Thu, 23 Jan 2014)
New Revision: 4607

Modified:
   pkg/RcppClassic/ChangeLog
   pkg/RcppClassic/DESCRIPTION
   pkg/RcppClassic/NAMESPACE
   pkg/RcppClassic/src/RcppResultSet.cpp
Log:
Minor updates

Add new #ifdef test to permit compilation under Rcpp versions later than 0.10.6 which changed once again
Updated DESCRIPTION and NAMESPACE as well


Modified: pkg/RcppClassic/ChangeLog
===================================================================
--- pkg/RcppClassic/ChangeLog	2014-01-15 03:50:32 UTC (rev 4606)
+++ pkg/RcppClassic/ChangeLog	2014-01-23 15:18:09 UTC (rev 4607)
@@ -1,3 +1,8 @@
+2014-01-23  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/RcppResultSet.cpp: Add new #ifdef test to permit compilation
+	under Rcpp versions later than 0.10.6 which changed once again
+
 2013-07-27  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.9.4

Modified: pkg/RcppClassic/DESCRIPTION
===================================================================
--- pkg/RcppClassic/DESCRIPTION	2014-01-15 03:50:32 UTC (rev 4606)
+++ pkg/RcppClassic/DESCRIPTION	2014-01-23 15:18:09 UTC (rev 4607)
@@ -1,6 +1,6 @@
 Package: RcppClassic
 Title: Deprecated 'classic' Rcpp API 
-Version: 0.9.4
+Version: 0.9.4.1
 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
@@ -9,7 +9,8 @@
  facilitates the integration of R and C++. 
  .
  New projects should use the new Rcpp API in the Rcpp package.
-Depends: R (>= 2.12.0), Rcpp (>= 0.10.2), methods
+Depends: R (>= 2.12.0), methods
+Imports: Rcpp (>= 0.10.2)
 Suggests: RUnit, inline
 LinkingTo: Rcpp
 License: GPL (>= 2)

Modified: pkg/RcppClassic/NAMESPACE
===================================================================
--- pkg/RcppClassic/NAMESPACE	2014-01-15 03:50:32 UTC (rev 4606)
+++ pkg/RcppClassic/NAMESPACE	2014-01-23 15:18:09 UTC (rev 4607)
@@ -1,3 +1,3 @@
 useDynLib(RcppClassic)
-import( Rcpp )
+importFrom(Rcpp, evalCpp)
 

Modified: pkg/RcppClassic/src/RcppResultSet.cpp
===================================================================
--- pkg/RcppClassic/src/RcppResultSet.cpp	2014-01-15 03:50:32 UTC (rev 4606)
+++ pkg/RcppClassic/src/RcppResultSet.cpp	2014-01-23 15:18:09 UTC (rev 4607)
@@ -3,7 +3,7 @@
 // RcppResultSet.cpp: RcppClassic R/C++ interface class library -- Results back to R
 //
 // Copyright (C) 2005 - 2006 Dominick Samperi
-// Copyright (C) 2008 - 2009 Dirk Eddelbuettel
+// Copyright (C) 2008 - 2014 Dirk Eddelbuettel
 // Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of RcppClassic.
@@ -28,7 +28,7 @@
 namespace Rcpp { 
     
     // these functions are no longer exported in Rcpp.h as of Rcpp 0.10.2
-    #if defined(RCPP_VERSION) && RCPP_VERSION > Rcpp_Version(0,10,1)
+    #if defined(RCPP_VERSION) && RCPP_VERSION >  Rcpp_Version(0,10,1) && RCPP_VERSION <= Rcpp_Version(0,10,6)
     namespace internal{
         
         SEXP getPosixClasses(){