Merge pull request #1075 from RcppCore/bugfix/1074

Use an explicit vector rather than R_alloc in sample

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,8 @@
+2020-04-25  Dirk Eddelbuettel  <[email protected]>
+
+	* inst/include/Rcpp/sugar/functions/sample.h: Replace R_alloc() with
+	a standard vector allocation to reduce memory consumption in sample
+
 2020-04-16  Dirk Eddelbuettel  <[email protected]>
 
 	* DESCRIPTION (Version, Date): Roll minor version

inst/NEWS.Rd

@@ -38,6 +38,11 @@
       \item The exceptions test is now partially skipped on Solaris as
       it already is on Windows (Dirk in \ghpr{1065}).
     }
+    \item Changes in Rcpp Sugar:
+    \itemize{
+      \item Two \code{sample()} objects are now standard vectors and not
+      \code{R_alloc} created (Dirk in \ghpr{1075} fixing \ghpr{1074}).
+    }
   }
 }
 

inst/include/Rcpp/sugar/functions/sample.h

@@ -348,7 +348,7 @@ inline Vector<INTSXP> EmpiricalSample(int n, int size, bool replace, bool one_ba
         return ans;
     }
 
-    int* x = reinterpret_cast<int*>(R_alloc(n, sizeof(int)));
+    IntegerVector x = no_init(n);
     for (int i = 0; i < n; i++) {
         x[i] = i;
     }
@@ -378,7 +378,7 @@ inline Vector<RTYPE> EmpiricalSample(int size, bool replace, const Vector<RTYPE>
         return ans;
     }
 
-    int* x = reinterpret_cast<int*>(R_alloc(n, sizeof(int)));
+    IntegerVector x = no_init(n);
     for (int i = 0; i < n; i++) {
         x[i] = i;
     }