push minor update to gitignore and ChangeLog from a few days ago

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,8 @@
+2014-05-28  Kevin Ushey  <[email protected]>
+
+        * inst/include/Rcpp/vector/vector_from_string.h: Protect result of
+        Rf_mkString
+
 2014-05-24  Dirk Eddelbuettel  <[email protected]>
 
         * .Rbuildignore: Add .dir-locals.el

inst/include/Rcpp/vector/ListOf.h

@@ -31,10 +31,14 @@ class ListOf {
 
     ListOf(): list(R_NilValue) {}
 
-    ListOf(SEXP data_): list(data_) {}
+    ListOf(SEXP data_): list(data_) {
+        std::transform(list.begin(), list.end(), list.begin(), as<T>);
+    }
 
     template <typename U>
-    ListOf(const U& data_): list(data_) {}
+    ListOf(const U& data_): list(data_) {
+        std::transform(list.begin(), list.end(), list.begin(), as<T>);
+    }
 
     ListOf(const ListOf& other): list(other.list) {}
 

inst/include/Rcpp/vector/vector_from_string.h

@@ -27,7 +27,8 @@ namespace internal{
 
     template <int RTYPE>
     inline SEXP vector_from_string( const std::string& st ) {
-        return r_cast<RTYPE>( Rf_mkString( st.c_str() ) ) ;
+        Shield<SEXP> str(Rf_mkString(st.c_str()));
+        return r_cast<RTYPE>(str) ;
     }
 
     template <int RTYPE>

inst/unitTests/cpp/ListOf.cpp

@@ -93,3 +93,8 @@ int test_sub_calls(NVList x) {
 NumericVector test_nested_listof(ListOf< ListOf<NumericVector> > x) {
   return x[0][0];
 }
+
+// [[Rcpp::export]]
+ListOf<IntegerVector> test_return_IVList(List x) {
+    return x;
+}

inst/unitTests/runit.ListOf.R

@@ -74,4 +74,17 @@ if (.runThisTest) {
         )
     }
 
+    test.ListOf.convert.implicit <- function() {
+        checkEquals(
+            test_return_IVList(list(1, 2, 3)),
+            list(1L, 2L, 3L)
+        )
+    }
+
+    test.ListOf.convert.fail <- function() {
+        checkException(
+            test_return_IVList(list("a", "b", "c"))
+        )
+    }
+
 }