Mercurial > forge

diff main/fixed/src/fixedMatrix.h @ 5248:f8d77845533f octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changes for compilation with 3.1.51+
author adb014
date Thu, 13 Nov 2008 22:49:30 +0000
parents 2de537641f94
children 0924c374b60d
line wrap: on
line diff
--- a/main/fixed/src/fixedMatrix.h	Thu Nov 13 13:20:17 2008 +0000
+++ b/main/fixed/src/fixedMatrix.h	Thu Nov 13 22:49:30 2008 +0000
@@ -46,7 +46,7 @@
 class FixedRowVector;
 #endif
 
-typedef FixedPoint (*f_f_Mapper)(FixedPoint);
+typedef FixedPoint (*fp_fp_Mapper)(FixedPoint);
 
 class
 OCTAVE_FIXED_API
@@ -93,6 +93,7 @@
 
   FixedMatrix (const FixedMatrix& a) : MArray2<FixedPoint> (a) { }
   FixedMatrix (const MArray2<FixedPoint>& a) : MArray2<FixedPoint> (a) { }
+  FixedMatrix (const Array2<FixedPoint> &a) : MArray2<FixedPoint> (a) { }
 
   explicit FixedMatrix (const FixedRowVector& rv);
 
@@ -170,8 +171,8 @@
 
   // other operations
 
-  FixedMatrix map (f_f_Mapper f) const;
-  FixedMatrix& apply (f_f_Mapper f);
+  FixedMatrix map (fp_fp_Mapper f) const;
+  FixedMatrix& apply (fp_fp_Mapper f);
 
   boolMatrix all (int dim = -1) const;
   boolMatrix any (int dim = -1) const;