Merge pull request #1069 from xhochy/clang

eddelbuettel · web-flow · commit a80908fe835a · 2020-04-15T08:31:21.000-05:00
Explicitly call abs as a function in DataFrame.h
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2020-04-15 Uwe Korn <mail@uwekorn.com>
+
+	* inst/include/Rcpp/DataFrame.h: Explicit call to scalar std::abs
+
 2020-04-11  Dirk Eddelbuettel  <edd@debian.org>
 
 	* DESCRIPTION (Version, Date): Roll minor version
diff --git a/inst/include/Rcpp/DataFrame.h b/inst/include/Rcpp/DataFrame.h
@@ -79,7 +79,7 @@ namespace Rcpp{
             if (Rf_isNull(rn))
                 return 0;
             if (TYPEOF(rn) == INTSXP && LENGTH(rn) == 2 && INTEGER(rn)[0] == NA_INTEGER)
-                return abs(INTEGER(rn)[1]);
+                return std::abs(INTEGER(rn)[1]);
             return LENGTH(rn);
         }
 

-Original file line number
+Diff line change
 +2020-04-15 Uwe Korn <[email protected]>
++
 +	* inst/include/Rcpp/DataFrame.h: Explicit call to scalar std::abs
++
 -04-11  Dirk Eddelbuettel  <[email protected]>
 	* DESCRIPTION (Version, Date): Roll minor version
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ namespace Rcpp{`
`79`	`79`	`if (Rf_isNull(rn))`
`80`	`80`	`return 0;`
`81`	`81`	`if (TYPEOF(rn) == INTSXP && LENGTH(rn) == 2 && INTEGER(rn)[0] == NA_INTEGER)`
`82`		`- return abs(INTEGER(rn)[1]);`
	`82`	`+ return std::abs(INTEGER(rn)[1]);`
`83`	`83`	`return LENGTH(rn);`
`84`	`84`	`}`
`85`	`85`