changeset 7810:5420b8cf011a

Error in FloatComplexLU instantiation
author David Bateman <dbateman@free.fr>
date Fri, 23 May 2008 17:56:10 +0200
parents 3af309919efc
children 12c8b195508f
files liboctave/ChangeLog liboctave/fCmplxLU.cc liboctave/floatLU.cc liboctave/floatLU.h
diffstat 4 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Fri May 23 09:35:08 2008 +0200
+++ b/liboctave/ChangeLog	Fri May 23 17:56:10 2008 +0200
@@ -1,5 +1,9 @@
 2008-06-02  David Bateman  <dbateman@free.fr>
 
+	* fCmplxLU.cc (class FloatComplexLU): Correct error in instantiation.
+	* floatLU.cc (class FloatLU): ditto.
+	* floatLU.h (class FloatLU): ditto.
+	
 	* floatAEPBAL.cc (octave_idx_type FloatAEPBALANCE::init (const
 	FloatMatrix&, const std::string&)): Use FloatMatrix to initialize
 	balancing_mat.
--- a/liboctave/fCmplxLU.cc	Fri May 23 09:35:08 2008 +0200
+++ b/liboctave/fCmplxLU.cc	Fri May 23 17:56:10 2008 +0200
@@ -34,7 +34,7 @@
 #include <base-lu.h>
 #include <base-lu.cc>
 
-template class base_lu <FloatComplexMatrix, FloatComplex, FloatMatrix, float>;
+template class base_lu <FloatComplexMatrix, FloatComplex, Matrix, double>;
 
 // Define the constructor for this particular derivation.
 
--- a/liboctave/floatLU.cc	Fri May 23 09:35:08 2008 +0200
+++ b/liboctave/floatLU.cc	Fri May 23 17:56:10 2008 +0200
@@ -34,7 +34,7 @@
 #include <base-lu.h>
 #include <base-lu.cc>
 
-template class base_lu <FloatMatrix, float, FloatMatrix, float>;
+template class base_lu <FloatMatrix, float, Matrix, double>;
 
 // Define the constructor for this particular derivation.
 
--- a/liboctave/floatLU.h	Fri May 23 09:35:08 2008 +0200
+++ b/liboctave/floatLU.h	Fri May 23 17:56:10 2008 +0200
@@ -25,24 +25,25 @@
 #define octave_FloatLU_h 1
 
 #include "base-lu.h"
+#include "dMatrix.h"
 #include "fMatrix.h"
 
 class
 OCTAVE_API
-FloatLU : public base_lu <FloatMatrix, float, FloatMatrix, float>
+FloatLU : public base_lu <FloatMatrix, float, Matrix, double>
 {
 public:
 
-  FloatLU (void) : base_lu <FloatMatrix, float, FloatMatrix, float> () { }
+  FloatLU (void) : base_lu <FloatMatrix, float, Matrix, double> () { }
 
   FloatLU (const FloatMatrix& a);
 
-  FloatLU (const FloatLU& a) : base_lu <FloatMatrix, float, FloatMatrix, float> (a) { }
+  FloatLU (const FloatLU& a) : base_lu <FloatMatrix, float, Matrix, double> (a) { }
 
   FloatLU& operator = (const FloatLU& a)
     {
       if (this != &a)
-	base_lu <FloatMatrix, float, FloatMatrix, float> :: operator = (a);
+	base_lu <FloatMatrix, float, Matrix, double> :: operator = (a);
 
       return *this;
     }