Skip to content

Commit 2e39b2f

Browse files
committed
applied patch by Thomas Tse to provide missing is<T>() for Character(Vector|Matrix)
1 parent edd9bef commit 2e39b2f

File tree

5 files changed

+26
-2
lines changed

5 files changed

+26
-2
lines changed

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2013-10-01 Dirk Eddelbuettel <edd@debian.org>
2+
3+
* inst/include/Rcpp/api/meat/is.h: Applied patch by Thomas Tse to
4+
provide missing Character(Vector|Matrix)
5+
6+
* DESCRIPTION: Bump to development release 0.10.5.1
7+
18
2013-09-28 Dirk Eddelbuettel <edd@debian.org>
29

310
* DESCRIPTION: Release 0.10.5

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 0.10.5
3+
Version: 0.10.5.1
44
Date: $Date$
55
Author: Dirk Eddelbuettel and Romain Francois, with contributions
66
by Douglas Bates, John Chambers and JJ Allaire

inst/NEWS.Rd

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
\title{News for Package 'Rcpp'}
33
\newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
44

5+
\section{Changes in Rcpp version 0.10.5.1 (2013-10-01)}{
6+
\itemize{
7+
\item Changes in Rcpp API:
8+
\itemize{
9+
\item Two missing \code{is<>()} templates for
10+
\code{CharacterVector} and \code{CharacterMatrix} have been added
11+
thanks to Thomas Tse.
12+
}
13+
}
14+
}
15+
516
\section{Changes in Rcpp version 0.10.5 (2013-09-28)}{
617
\itemize{
718
\item Changes in R code:

inst/THANKS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Dominick Samperi for starting what is now in the RcppClassic package
2525
Oleg Sklyar for the incredibly cool inline package
2626
Alexey Stukalov for a support enabling Intel Compiler 12.0 support
2727
Luke Tierney for helpful discussions on R internals
28+
Thomas Tse for a patch filling in two missing is<T>() instances
2829
Simon Urbanek for help on OS X build issues and with R internals
2930
Ken Williams for additional OS X testing
3031
Jelmer Ypma for contributing the Rcout iostreams class patch

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@ namespace internal{
5050
template <> inline bool is__simple<String>( SEXP x ){
5151
return is_atomic(x) && TYPEOF(x) == STRSXP ;
5252
}
53-
53+
template <> inline bool is__simple<CharacterVector>(SEXP x) {
54+
return TYPEOF(x) == STRSXP;
55+
}
56+
template <> inline bool is__simple<CharacterMatrix>(SEXP x) {
57+
return TYPEOF(x) == STRSXP && is_matrix(x);
58+
}
5459
template <> inline bool is__simple<RObject>( SEXP x ){
5560
return true ;
5661
}

0 commit comments

Comments
 (0)