# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1292292549 18000
# Node ID 5ea2644b0111b10d3f648fa4ce90fd23633360d3
# Parent  bff585d759cfad903022e16a4941a07ac96044f6
fix cut and paste error in Matrix by ComplexMatrix multiplication operator

diff --git a/liboctave/CMatrix.cc b/liboctave/CMatrix.cc
--- a/liboctave/CMatrix.cc
+++ b/liboctave/CMatrix.cc
@@ -3668,7 +3668,7 @@
   if (a.rows () > std::min (m.rows (), a.columns ()) / 10)
     return ComplexMatrix (m * real (a), m * imag (a));
   else
-    return m * ComplexMatrix (a);
+    return ComplexMatrix (m) * a;
 }
 
 /* Simple Dot Product, Matrix-Vector and Matrix-Matrix Unit tests
diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-13  John W. Eaton  <jwe@octave.org>
+
+	* CMatrix.cc (operator * (const Matrix& m, const ComplexMatrix&	a)):
+	Fix cut and paste error.
+
 2010-12-09  Marco Atzeri  <marco_atzeri@yahoo.it>
 
 	* lo-specfun.cc (xgamma): Also handle negative integer values as