Skip to content

Commit 57dcb71

Browse files
committed
Merging Dan's PR into this feature/issue383 branch
2 parents 4c8565b + 5d0956f commit 57dcb71

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2015-11-08 Daniel C. Dillon <[email protected]>
2+
3+
* inst/include/Rcpp/Nullable.h: No longer prevent assignment of
4+
R_NilValue to Nullable<> in function signatures
5+
16
2015-11-07 Dirk Eddelbuettel <[email protected]>
27

38
* inst/include/Rcpp/vector/Matrix.h (Rcpp): Beginnings of a Matrix

inst/NEWS.Rd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
by Qiang, fixing a bug reported by Allessandro on the list)
1818
\item Matrix classes now have a \code{transpose()} function (fixing
1919
\ghit{383})
20+
\item \code{Nullable} types can now be assigned \code{R_NilValue} in
21+
function signatures. (PR \ghpr{395} by Dan, fixing issue \ghit{394})
2022
}
2123
\item Changes in Rcpp Attributes:
2224
\itemize{

inst/include/Rcpp/Nullable.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ namespace Rcpp {
3131

3232
template<class T>
3333
class Nullable {
34-
private:
35-
template<class U>
36-
friend class InputParameter;
37-
38-
template<class U>
39-
friend class traits::Exporter;
40-
4134
public:
4235

4336
/**
@@ -55,8 +48,6 @@ namespace Rcpp {
5548

5649
inline Nullable(const T &t) : m_sexp(t), m_set(true) {}
5750

58-
protected:
59-
6051
/**
6152
* Standard constructor of a Nullable object
6253
*

0 commit comments

Comments
 (0)