Merge pull request #374 from fplaza/dimension-fix

eddelbuettel · eddelbuettel · commit 8c6bff220cc8 · 2015-09-23T11:11:41.000-05:00
fix wrong return type in product of dimensions
diff --git a/inst/include/Rcpp/Dimension.h b/inst/include/Rcpp/Dimension.h
@@ -56,7 +56,7 @@ namespace Rcpp{
 	    inline int size() const {
 	        return (int) dims.size() ;
 	    }
-	    inline int prod() const {
+	    inline R_xlen_t prod() const {
 	        return std::accumulate( dims.begin(), dims.end(), static_cast<R_xlen_t>(1), std::multiplies<R_xlen_t>() );
 	    }
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ namespace Rcpp{`
`56`	`56`	`inline int size() const {`
`57`	`57`	`return (int) dims.size() ;`
`58`	`58`	`}`
`59`		`- inline int prod() const {`
	`59`	`+ inline R_xlen_t prod() const {`
`60`	`60`	`return std::accumulate( dims.begin(), dims.end(), static_cast<R_xlen_t>(1), std::multiplies<R_xlen_t>() );`
`61`	`61`	`}`
`62`	`62`