Mercurial > forge
diff main/fixed/src/fixedRowVector.h @ 9481:d84d2fea3c90 octave-forge
Re-enable compilation of fixed package
author | jordigh |
---|---|
date | Wed, 22 Feb 2012 22:07:33 +0000 |
parents | f8d77845533f |
children | 7b7cd174847c |
line wrap: on
line diff
--- a/main/fixed/src/fixedRowVector.h Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/fixedRowVector.h Wed Feb 22 22:07:33 2012 +0000 @@ -50,7 +50,7 @@ FixedRowVector (void) : MArray<FixedPoint> () { } - explicit FixedRowVector (int n) : MArray<FixedPoint> (n) { } + explicit FixedRowVector (int n) : MArray<FixedPoint> (dim_vector (1,n)) { } FixedRowVector (const MArray<int> &is, const MArray<int> &ds); @@ -81,7 +81,8 @@ FixedRowVector (const RowVector &is, const RowVector &ds, const RowVector& a, const RowVector& b); - FixedRowVector (int n, FixedPoint val) : MArray<FixedPoint> (n, val) { } + FixedRowVector (int n, FixedPoint val) + : MArray<FixedPoint> (dim_vector(1, n), val) { } FixedRowVector (const FixedRowVector& a) : MArray<FixedPoint> (a) { } @@ -176,9 +177,11 @@ friend std::ostream& operator << (std::ostream& os, const FixedRowVector& a); friend std::istream& operator >> (std::istream& is, FixedRowVector& a); -private: - - FixedRowVector (FixedPoint *d, int l) : MArray<FixedPoint> (d, l) { } + void resize (octave_idx_type n, + const FixedPoint& rfv = Array<FixedPoint>::resize_fill_value ()) + { + Array<FixedPoint>::resize (dim_vector (1, n), rfv); + } }; FixedPoint operator * (const FixedRowVector& a, const FixedColumnVector& b);