[Rcpp-commits] r4553 - in pkg/Rcpp: . inst inst/include/Rcpp/api/meat

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

Author: edd
Date: 2013-10-02 05:04:36 +0200 (Wed, 02 Oct 2013)
New Revision: 4553

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/NEWS.Rd
   pkg/Rcpp/inst/THANKS
   pkg/Rcpp/inst/include/Rcpp/api/meat/is.h
Log:
applied patch by Thomas Tse to provide missing is<T>() for Character(Vector|Matrix)


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-09-30 01:05:25 UTC (rev 4552)
+++ pkg/Rcpp/ChangeLog	2013-10-02 03:04:36 UTC (rev 4553)
@@ -1,3 +1,10 @@
+2013-10-01  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/include/Rcpp/api/meat/is.h: Applied patch by Thomas Tse to
+	provide missing Character(Vector|Matrix)
+
+        * DESCRIPTION: Bump to development release 0.10.5.1
+
 2013-09-28  Dirk Eddelbuettel  <edd at debian.org>
 
         * DESCRIPTION: Release 0.10.5

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2013-09-30 01:05:25 UTC (rev 4552)
+++ pkg/Rcpp/DESCRIPTION	2013-10-02 03:04:36 UTC (rev 4553)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.10.5
+Version: 0.10.5.1
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Douglas Bates, John Chambers and JJ Allaire

Modified: pkg/Rcpp/inst/NEWS.Rd
===================================================================
--- pkg/Rcpp/inst/NEWS.Rd	2013-09-30 01:05:25 UTC (rev 4552)
+++ pkg/Rcpp/inst/NEWS.Rd	2013-10-02 03:04:36 UTC (rev 4553)
@@ -2,6 +2,17 @@
 \title{News for Package 'Rcpp'}
 \newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
 
+\section{Changes in Rcpp version 0.10.5.1 (2013-10-01)}{
+  \itemize{
+    \item Changes in Rcpp API:
+    \itemize{
+      \item Two missing \code{is<>()} templates for
+      \code{CharacterVector} and \code{CharacterMatrix} have been added
+      thanks to Thomas Tse.  
+    }
+  }
+}
+
 \section{Changes in Rcpp version 0.10.5 (2013-09-28)}{
   \itemize{
     \item Changes in R code:

Modified: pkg/Rcpp/inst/THANKS
===================================================================
--- pkg/Rcpp/inst/THANKS	2013-09-30 01:05:25 UTC (rev 4552)
+++ pkg/Rcpp/inst/THANKS	2013-10-02 03:04:36 UTC (rev 4553)
@@ -25,6 +25,7 @@
 Oleg Sklyar             for the incredibly cool inline package
 Alexey Stukalov         for a support enabling Intel Compiler 12.0 support
 Luke Tierney            for helpful discussions on R internals
+Thomas Tse              for a patch filling in two missing is<T>() instances
 Simon Urbanek           for help on OS X build issues and with R internals
 Ken Williams            for additional OS X testing
 Jelmer Ypma             for contributing the Rcout iostreams class patch

Modified: pkg/Rcpp/inst/include/Rcpp/api/meat/is.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/api/meat/is.h	2013-09-30 01:05:25 UTC (rev 4552)
+++ pkg/Rcpp/inst/include/Rcpp/api/meat/is.h	2013-10-02 03:04:36 UTC (rev 4553)
@@ -50,7 +50,12 @@
     template <> inline bool is__simple<String>( SEXP x ){
         return is_atomic(x) && TYPEOF(x) == STRSXP ;
     }
-    
+    template <> inline bool is__simple<CharacterVector>(SEXP x) {
+        return TYPEOF(x) == STRSXP;
+    }
+    template <> inline bool is__simple<CharacterMatrix>(SEXP x) {
+        return TYPEOF(x) == STRSXP && is_matrix(x);
+    }
     template <> inline bool is__simple<RObject>( SEXP x ){
         return true ;
     }