[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Toon-members] TooN/internal matrix.hh
From: |
Tom Drummond |
Subject: |
[Toon-members] TooN/internal matrix.hh |
Date: |
Sun, 12 Apr 2009 00:11:28 +0000 |
CVSROOT: /cvsroot/toon
Module name: TooN
Changes by: Tom Drummond <twd20> 09/04/12 00:11:28
Modified files:
internal : matrix.hh
Log message:
removed non-functional constructor from matrix and added comment to
slicing constructor
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/matrix.hh?cvsroot=toon&r1=1.25&r2=1.26
Patches:
Index: matrix.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/matrix.hh,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- matrix.hh 11 Apr 2009 05:23:16 -0000 1.25
+++ matrix.hh 12 Apr 2009 00:11:27 -0000 1.26
@@ -9,7 +9,6 @@
using Layout::template Layout<Rows, Cols, Precision>::num_cols;
//Use Tom's sneaky constructor hack...
-
Matrix(){}
Matrix(int rows, int cols) :
@@ -24,23 +23,10 @@
Layout::template Layout<Rows, Cols, Precision>(p, r, c)
{}
-
- //The stride is always passed during a slice. If it is not
- //needed, it will be ignored later and not stored.
- Matrix(Precision* data, int rowstride, int colstride, Internal::Slicing)
- :Layout::template Layout<Rows, Cols, Precision>(data, rowstride,
colstride){}
-
+ // Internal constructor used by GenericMBase::slice(...)
Matrix(Precision* data, int rows, int cols, int rowstride, int
colstride, Internal::Slicing)
:Layout::template Layout<Rows, Cols, Precision>(data, rows, cols,
rowstride, colstride){}
-
-
- // Pass on a generic struct holding data about a slice
-// template<class C>
-// Matrix(Precision* data, const SliceSpec<C>& slice)
-// :Layout::template Layout<Rows,Cols,Precision>(data, slice)
-// {}
-
//See vector.hh and allocator.hh for details about why the
//copy constructor should be default.
template <class Op>
@@ -49,6 +35,7 @@
{
op.eval(*this);
}
+
// constructors to allow return value optimisations
// construction from 1-ary operator
template <class T, class Op>