Merge pull request #688 from krlmlr/f-Wconversion-2

Reduce -Wconversion warnings for sugar code

Author: eddelbuettel

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

@@ -63,12 +63,12 @@ inline void incr(Rcomplex* lhs, const Rcomplex& rhs) {
 
 
 inline void div(double* lhs, R_xlen_t rhs) {
-    *lhs /= rhs;
+    *lhs /= static_cast<double>(rhs);
 }
 
 inline void div(Rcomplex* lhs, R_xlen_t rhs) {
-    lhs->r /= rhs;
-    lhs->i /= rhs;
+    lhs->r /= static_cast<double>(rhs);
+    lhs->i /= static_cast<double>(rhs);
 }
 
 

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

@@ -57,7 +57,7 @@ namespace sugar {
 inline void Normalize(Vector<REALSXP>& p, int require_k, bool replace)
 {
     double sum = 0.0;
-    int npos = 0, i = 0, n = p.size();
+    R_xlen_t npos = 0, i = 0, n = p.size();
 
     for ( ; i < n; i++) {
         if (!R_FINITE(p[i]) || (p[i] < 0)) {

inst/include/Rcpp/sugar/functions/strings/trimws.h

@@ -133,7 +133,8 @@ inline Vector<STRSXP> trimws(const Vector<STRSXP>& x, const char* which = "both"
 }
 
 inline Matrix<STRSXP> trimws(const Matrix<STRSXP>& x, const char* which = "both") {
-    R_xlen_t i = 0, nr = x.nrow(), nc = x.ncol(), sz = x.size();
+    R_xlen_t i = 0, sz = x.size();
+    int nr = x.nrow(), nc = x.ncol();
     Matrix<STRSXP> res = no_init(nr, nc);
     std::string buffer;