Skip to content

Commit 0a94e89

Browse files
remove unused method
1 parent f490df0 commit 0a94e89

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

inst/include/Rcpp/api/meat/Matrix.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
namespace Rcpp{
2626

27-
template <int RTYPE>
28-
Matrix<RTYPE>::Matrix(SEXP x) : VECTOR( r_cast<RTYPE>( x ) ), nrows( VECTOR::dims()[0] ) {}
27+
template <int RTYPE, template <class> class StoragePolicy >
28+
Matrix<RTYPE, StoragePolicy>::Matrix(SEXP x) : VECTOR( r_cast<RTYPE>( x ) ), nrows( VECTOR::dims()[0] ) {}
2929

3030
template <int RTYPE>
3131
Matrix<RTYPE>::Matrix( const Dimension& dims) : VECTOR( Rf_allocMatrix( RTYPE, dims[0], dims[1] ) ), nrows(dims[0]) {

inst/include/Rcpp/vector/Matrix.h

Lines changed: 4 additions & 9 deletions
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 - 2012 Dirk Eddelbuettel and Romain Francois
5+
// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
66
//
77
// This file is part of Rcpp.
88
//
@@ -24,8 +24,8 @@
2424

2525
class Dimension ;
2626

27-
template <int RTYPE>
28-
class Matrix : public Vector<RTYPE>, public MatrixBase<RTYPE,true, Matrix<RTYPE> > {
27+
template <int RTYPE, template <class> class StoragePolicy = PreserveStorage >
28+
class Matrix : public Vector<RTYPE, StoragePolicy>, public MatrixBase<RTYPE, true, Matrix<RTYPE,StoragePolicy> > {
2929
int nrows ;
3030

3131
public:
@@ -35,7 +35,7 @@ class Matrix : public Vector<RTYPE>, public MatrixBase<RTYPE,true, Matrix<RTYPE>
3535
typedef MatrixColumn<RTYPE> Column ;
3636
typedef SubMatrix<RTYPE> Sub ;
3737

38-
typedef Vector<RTYPE> VECTOR ;
38+
typedef Vector<RTYPE, StoragePolicy> VECTOR ;
3939
typedef typename VECTOR::iterator iterator ;
4040
typedef typename VECTOR::const_iterator const_iterator ;
4141
typedef typename VECTOR::converter_type converter_type ;
@@ -107,11 +107,6 @@ class Matrix : public Vector<RTYPE>, public MatrixBase<RTYPE,true, Matrix<RTYPE>
107107

108108
inline int offset( int i, int j) const { return i + nrows * j ; }
109109

110-
void update_matrix(){
111-
RCPP_DEBUG_1( "%s::update_matrix", DEMANGLE(Matrix) ) ;
112-
VECTOR::update_vector() ;
113-
}
114-
115110
template <typename U>
116111
void fill_diag__dispatch( traits::false_type, const U& u) ;
117112

0 commit comments

Comments
 (0)