Skip to content

Commit f5be332

Browse files
committed
disambiguate size() in Matrix
apparently needed by g++-6
1 parent fd0b205 commit f5be332

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2016-12-07 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/include/Rcpp/vector/Matrix.h: Add 'using ...' to disambiguate size()
4+
15
2016-12-04 Dirk Eddelbuettel <[email protected]>
26

37
* .codecov.yml (comment): Enable more verbose codecov.io reports

inst/include/Rcpp/vector/Matrix.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Matrix.h: Rcpp R/C++ interface class library -- matrices
44
//
5-
// Copyright (C) 2010 - 2015 Dirk Eddelbuettel and Romain Francois
5+
// Copyright (C) 2010 - 2016 Dirk Eddelbuettel and Romain Francois
66
//
77
// This file is part of Rcpp.
88
//
@@ -29,6 +29,8 @@ class Matrix : public Vector<RTYPE, StoragePolicy>, public MatrixBase<RTYPE, tru
2929
int nrows ;
3030

3131
public:
32+
using Vector<RTYPE, StoragePolicy>::size; // disambiguate diamond pattern for g++-6 and later
33+
3234
struct r_type : traits::integral_constant<int,RTYPE>{} ;
3335
struct can_have_na : traits::true_type{} ;
3436
typedef MatrixRow<RTYPE> Row ;

0 commit comments

Comments
 (0)