Skip to content

Commit bd491da

Browse files
committed
also speed up complex case (extending #799)
1 parent 38d024f commit bd491da

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

ChangeLog

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1+
2018-01-14 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/include/Rcpp/traits/is_na.h (Rcpp): Also speed up
4+
Rcpp::is_na<Rcomplex>
5+
16
2018-01-11 Kirill Müller <[email protected]>
27

38
* inst/include/Rcpp/traits/is_na.h: Speed up Rcpp::is_na<double>()
4-
(pull request #799)
59

610
2018-01-09 Iñaki Ucar <[email protected]>
711

812
* inst/include/Rcpp/vector/proxy.h: Improve support for NVCC, the CUDA
9-
compiler (pull request #798, fixed issue #797)
1013

1114
2018-01-06 Kendon Bell <[email protected]>
1215

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 0.12.14.5
4-
Date: 2017-12-21
3+
Version: 0.12.14.6
4+
Date: 2018-01-14
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
66
Nathan Russell, Douglas Bates and John Chambers
77
Maintainer: Dirk Eddelbuettel <[email protected]>

inst/include/Rcpp/traits/is_na.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
//
33
// is_na.h: Rcpp R/C++ interface class library -- vector operators
44
//
5-
// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
5+
// Copyright (C) 2010 - 2018 Dirk Eddelbuettel and Romain Francois
6+
// Copyright (C) 2018 Dirk Eddelbuettel and Kirill Mueller
67
//
78
// This file is part of Rcpp.
89
//
@@ -44,8 +45,7 @@ namespace Rcpp{
4445

4546
template <>
4647
inline bool is_na<CPLXSXP>(Rcomplex x) {
47-
return internal::Rcpp_IsNA(x.r) || internal::Rcpp_IsNA(x.i) ||
48-
internal::Rcpp_IsNaN(x.r) || internal::Rcpp_IsNaN(x.i);
48+
return R_isnancpp(x.r) || R_isnancpp(x.i);
4949
}
5050

5151
template <>

0 commit comments

Comments
 (0)