[Rcpp-commits] r1353 - in pkg: Rcpp Rcpp/R Rcpp/inst/unitTests RcppArmadillo RcppArmadillo/R RcppArmadillo/inst/unitTests

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

Author: romain
Date: 2010-05-28 19:13:59 +0200 (Fri, 28 May 2010)
New Revision: 1353

Modified:
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/R/inline.R
   pkg/Rcpp/inst/unitTests/runTests.R
   pkg/RcppArmadillo/DESCRIPTION
   pkg/RcppArmadillo/R/inline.R
   pkg/RcppArmadillo/inst/unitTests/runTests.R
Log:
s/inline_cxx_plugin/inlineCxxPlugin/g

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2010-05-28 16:44:31 UTC (rev 1352)
+++ pkg/Rcpp/DESCRIPTION	2010-05-28 17:13:59 UTC (rev 1353)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Rcpp R/C++ interface package
-Version: 0.8.1
+Version: 0.8.0.1
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Simon Urbanek, David Reiss and Douglas Bates; based on code written during 

Modified: pkg/Rcpp/R/inline.R
===================================================================
--- pkg/Rcpp/R/inline.R	2010-05-28 16:44:31 UTC (rev 1352)
+++ pkg/Rcpp/R/inline.R	2010-05-28 17:13:59 UTC (rev 1353)
@@ -55,5 +55,5 @@
 }
 }
 
-inline_cxx_plugin <- Rcpp.plugin.maker() 
+inlineCxxPlugin <- Rcpp.plugin.maker() 
 

Modified: pkg/Rcpp/inst/unitTests/runTests.R
===================================================================
--- pkg/Rcpp/inst/unitTests/runTests.R	2010-05-28 16:44:31 UTC (rev 1352)
+++ pkg/Rcpp/inst/unitTests/runTests.R	2010-05-28 17:13:59 UTC (rev 1353)
@@ -4,8 +4,8 @@
 	stop( "The inline package is required to run Rcpp unit tests" )
 }
 
-if( compareVersion( packageDescription( "inline" )[["Version"]], "0.3.4.3" ) < 0 ){
-	stop( "Rcpp unit tests need at least the version 0.3.4.3 of inline" )
+if( compareVersion( packageDescription( "inline" )[["Version"]], "0.3.4.4" ) < 0 ){
+	stop( "Rcpp unit tests need at least the version 0.3.4.4 of inline" )
 }
 
 cppfunction <- function(...){

Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION	2010-05-28 16:44:31 UTC (rev 1352)
+++ pkg/RcppArmadillo/DESCRIPTION	2010-05-28 17:13:59 UTC (rev 1353)
@@ -1,7 +1,7 @@
 Package: RcppArmadillo
 Type: Package
 Title: Rcpp/Armadillo bridge
-Version: 0.2.1.1
+Version: 0.2.1.2
 Date: $Date$
 Author: Romain Francois, Dirk Eddelbuettel and Doug Bates
 Maintainer: Romain, Dirk and Doug <RcppArmadillo-authors at r-enthusiasts.com>
@@ -27,7 +27,7 @@
  capabilities of the Rcpp package for seamless R and C++ integration/
 License: GPL (>= 2)
 LazyLoad: yes
-Depends: R (>= 2.10.0), Rcpp (>= 0.8.1)
+Depends: R (>= 2.10.0), Rcpp (>= 0.8.0.1)
 LinkingTo: Rcpp
 Suggests: inline
 SystemRequirements: GNU make

Modified: pkg/RcppArmadillo/R/inline.R
===================================================================
--- pkg/RcppArmadillo/R/inline.R	2010-05-28 16:44:31 UTC (rev 1352)
+++ pkg/RcppArmadillo/R/inline.R	2010-05-28 17:13:59 UTC (rev 1353)
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with RcppArmadillo.  If not, see <http://www.gnu.org/licenses/>.
 
-inline_cxx_plugin <- Rcpp:::Rcpp.plugin.maker(
+inlineCxxPlugin <- Rcpp:::Rcpp.plugin.maker(
 	include.before = "#include <RcppArmadillo.h>", 
 	libs           = "$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", 
 	package        = "RcppArmadillo"

Modified: pkg/RcppArmadillo/inst/unitTests/runTests.R
===================================================================
--- pkg/RcppArmadillo/inst/unitTests/runTests.R	2010-05-28 16:44:31 UTC (rev 1352)
+++ pkg/RcppArmadillo/inst/unitTests/runTests.R	2010-05-28 17:13:59 UTC (rev 1353)
@@ -4,8 +4,8 @@
 	stop( "The inline package is required to run RcppArmadillo unit tests" )
 }
 
-if( compareVersion( packageDescription( "inline" )[["Version"]], "0.3.4.3" ) < 0 ){
-	stop( "RcppArmadillo unit tests need at least the version 0.3.4.3 of inline" )
+if( compareVersion( packageDescription( "inline" )[["Version"]], "0.3.4.4" ) < 0 ){
+	stop( "RcppArmadillo unit tests need at least the version 0.3.4.4 of inline" )
 }
 
 if(require("RUnit", quietly = TRUE)) {