Merge pull request #288 from romainfrancois/master

added omitted is__simple<Rcomplex>.

Author: jjallaire

ChangeLog

@@ -1,3 +1,7 @@
+2014-04-14  Romain Francois  <[email protected]>
+
+        * inst/include/Rcpp/api/meat/is.h: added is__simple<Rcomplex>
+
 2015-04-12  Dirk Eddelbuettel  <[email protected]>
 
         * vignettes/Rcpp-FAQ.Rnw: Also load Rcpp to make cppFunction visible

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.11.5.2
+Version: 0.11.5.3
 Date: 2015-04-11
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, 
  Douglas Bates, and John Chambers

inst/include/Rcpp/api/meat/is.h

@@ -45,6 +45,9 @@ namespace Rcpp {
     template <> inline bool is__simple<String>(SEXP x) {
         return is_atomic(x) && TYPEOF(x) == STRSXP;
     }
+    template <> inline bool is__simple<Rcomplex>(SEXP x) {
+        return is_atomic(x) && TYPEOF(x) == CPLXSXP;
+    }
     template <> inline bool is__simple<CharacterVector>(SEXP x) {
         return TYPEOF(x) == STRSXP;
     }

inst/include/Rcpp/config.h

@@ -30,7 +30,7 @@
 #define RCPP_VERSION Rcpp_Version(0,11,5)
 
 // the current source snapshot
-#define RCPP_DEV_VERSION RcppDevVersion(0,11,5,0)
+#define RCPP_DEV_VERSION RcppDevVersion(0,11,5,3)
 
 #endif