changeset 11277:7b7cd174847c octave-forge

fixed: remove obsolete resize_fill_value()
author jordigh
date Fri, 30 Nov 2012 20:11:09 +0000
parents 3f056f8b0358
children 2deb6b24d293
files main/fixed/src/fixedCColVector.h main/fixed/src/fixedCMatrix.h main/fixed/src/fixedCNDArray.h main/fixed/src/fixedCRowVector.h main/fixed/src/fixedColVector.h main/fixed/src/fixedMatrix.h main/fixed/src/fixedNDArray.h main/fixed/src/fixedRowVector.h main/fixed/src/ov-base-fixed-mat.cc
diffstat 9 files changed, 6 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/main/fixed/src/fixedCColVector.h	Fri Nov 30 12:46:01 2012 +0000
+++ b/main/fixed/src/fixedCColVector.h	Fri Nov 30 20:11:09 2012 +0000
@@ -245,7 +245,7 @@
   friend std::istream& operator >> (std::istream& is, FixedComplexColumnVector& a);
 
   void resize (octave_idx_type n,
-               const FixedPointComplex& rfv = Array<FixedPointComplex>::resize_fill_value ())
+               const FixedPointComplex& rfv = FixedPointComplex ())
   {
     Array<FixedPointComplex>::resize (dim_vector (n, 1), rfv);
   }
--- a/main/fixed/src/fixedCMatrix.h	Fri Nov 30 12:46:01 2012 +0000
+++ b/main/fixed/src/fixedCMatrix.h	Fri Nov 30 20:11:09 2012 +0000
@@ -314,8 +314,6 @@
   friend OCTAVE_FIXED_API std::istream& operator >> (std::istream& is, FixedComplexMatrix& a);
 
 
-  static FixedPointComplex resize_fill_value (void) 
-      { return FixedPointComplex(); }
 };
 
 OCTAVE_FIXED_API FixedComplexMatrix operator * (const FixedComplexColumnVector& a, 
--- a/main/fixed/src/fixedCNDArray.h	Fri Nov 30 12:46:01 2012 +0000
+++ b/main/fixed/src/fixedCNDArray.h	Fri Nov 30 20:11:09 2012 +0000
@@ -249,8 +249,6 @@
 				    const FixedComplexNDArray& a);
   friend std::istream& operator >> (std::istream& is, FixedComplexNDArray& a);
 
-  static FixedPointComplex resize_fill_value (void) 
-      { return FixedPointComplex(); }
 };
 
 
--- a/main/fixed/src/fixedCRowVector.h	Fri Nov 30 12:46:01 2012 +0000
+++ b/main/fixed/src/fixedCRowVector.h	Fri Nov 30 20:11:09 2012 +0000
@@ -241,7 +241,7 @@
   friend std::istream& operator >> (std::istream& is, FixedComplexRowVector& a);
 
   void resize (octave_idx_type n,
-               const FixedPointComplex& rfv = Array<FixedPointComplex>::resize_fill_value ())
+               const FixedPointComplex& rfv = FixedPointComplex ())
   {
     Array<FixedPointComplex>::resize (dim_vector (1, n), rfv);
   }
--- a/main/fixed/src/fixedColVector.h	Fri Nov 30 12:46:01 2012 +0000
+++ b/main/fixed/src/fixedColVector.h	Fri Nov 30 20:11:09 2012 +0000
@@ -183,7 +183,7 @@
                                     FixedColumnVector& a);
 
   void resize (octave_idx_type n,
-               const FixedPoint& rfv = Array<FixedPoint>::resize_fill_value ())
+               const FixedPoint& rfv = FixedPoint ())
   {
     Array<FixedPoint>::resize (dim_vector (n, 1), rfv);
   }
--- a/main/fixed/src/fixedMatrix.h	Fri Nov 30 12:46:01 2012 +0000
+++ b/main/fixed/src/fixedMatrix.h	Fri Nov 30 20:11:09 2012 +0000
@@ -170,7 +170,7 @@
   FixedColumnVector column (char *s) const;
 
   void resize (octave_idx_type nr, octave_idx_type nc,
-               const FixedPoint& rfv = resize_fill_value ())
+               const FixedPoint& rfv = FixedPoint ())
   {
     MArray<FixedPoint>::resize (dim_vector (nr, nc), rfv);
   }
@@ -252,8 +252,6 @@
   friend OCTAVE_FIXED_API std::ostream& operator << (std::ostream& os, const FixedMatrix& a);
   friend OCTAVE_FIXED_API std::istream& operator >> (std::istream& is, FixedMatrix& a);
 
-  static FixedPoint resize_fill_value (void) { return FixedPoint(); }
-
 };
 
 OCTAVE_FIXED_API FixedMatrix operator * (const FixedColumnVector& a, const FixedRowVector& b);
--- a/main/fixed/src/fixedNDArray.h	Fri Nov 30 12:46:01 2012 +0000
+++ b/main/fixed/src/fixedNDArray.h	Fri Nov 30 20:11:09 2012 +0000
@@ -185,7 +185,6 @@
   friend std::ostream& operator << (std::ostream& os, const FixedNDArray& a);
   friend std::istream& operator >> (std::istream& is, FixedNDArray& a);
 
-  static FixedPoint resize_fill_value (void) { return FixedPoint(); }
 };
 
 // FixedNDArray abs  (const FixedNDArray &x);
--- a/main/fixed/src/fixedRowVector.h	Fri Nov 30 12:46:01 2012 +0000
+++ b/main/fixed/src/fixedRowVector.h	Fri Nov 30 20:11:09 2012 +0000
@@ -178,7 +178,7 @@
   friend std::istream& operator >> (std::istream& is, FixedRowVector& a);
 
   void resize (octave_idx_type n,
-               const FixedPoint& rfv = Array<FixedPoint>::resize_fill_value ())
+               const FixedPoint& rfv = FixedPoint ())
   {
     Array<FixedPoint>::resize (dim_vector (1, n), rfv);
   }
--- a/main/fixed/src/ov-base-fixed-mat.cc	Fri Nov 30 12:46:01 2012 +0000
+++ b/main/fixed/src/ov-base-fixed-mat.cc	Fri Nov 30 20:11:09 2012 +0000
@@ -106,7 +106,7 @@
       for (octave_idx_type i = 0; i < len; i++)
 	ra_idx(i) = idx(i).index_vector ();
 
-      matrix.assign (ra_idx, rhs, MT::resize_fill_value ());
+      matrix.assign (ra_idx, rhs, FixedPoint ());
     }
 }