Skip to content

replace STRING_ELT with SET_STRING_ELT (closes #377) #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2015
Merged

replace STRING_ELT with SET_STRING_ELT (closes #377) #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2015-09-28 Dirk Eddelbuettel <edd@debian.org>

* src/barrier.cpp: Use SET_STRING_ELT() on LHS (with thanks to Luke)

2015-09-21 Dirk Eddelbuettel <edd@debian.org>

* inst/include/Rcpp/String.h: Before assigning ensure we received
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 0.12.1.1
Date: 2015-09-21
Version: 0.12.1.2
Date: 2015-09-28
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey,
Qiang Kou, Douglas Bates and John Chambers
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Expand Down
4 changes: 3 additions & 1 deletion inst/NEWS.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
\item Changes in Rcpp API:
\itemize{
\item Before creating a single String object from a \code{SEXP}, ensure
that it is from a vector of length one (issue #375)
that it is from a vector of length one (issue #375).
\item No longer use \code{STRING_ELT} as left-hand side, thanks to a
heads-up by Luke Tierney (issue #377).
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/barrier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ const char* char_get_string_elt(SEXP x, int i) {

// [[Rcpp::register]]
void set_string_elt(SEXP x, int i, SEXP value) {
STRING_ELT(x, i) = value;
SET_STRING_ELT(x, i, value);
}

// [[Rcpp::register]]
void char_set_string_elt(SEXP x, int i, const char* value) {
STRING_ELT(x, i) = Rf_mkChar(value);
SET_STRING_ELT(x, i, Rf_mkChar(value));
}

// [[Rcpp::register]]
Expand Down