Mercurial > octave

diff liboctave/CMatrix.cc @ 13107:353c71c76f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: fix compilation problem with g++ -std=c++0x option * CColVector.cc (conj): Tag std::conj with <double>. * CMatrix.cc (conj): Tag std::conj with <double>. * CNDArray.cc (conj): Tag std::conj with <double>. * CRowVector.cc (conj): Tag std::conj with <double>. * fCColVector.cc (conj): Tag std::conj with <float>. * fCMatrix.cc (conj): Tag std::conj with <float>. * fCNDArray.cc (conj): Tag std::conj with <float>. * fCRowVector.cc (conj): Tag std::conj with <float>. * ov-cx-sparse.cc (conj): Tag std::conj with <double>.
author Júlio Hoffimann <julio.hoffimann@gmail.com>
date Tue, 06 Sep 2011 14:58:44 -0400
parents a9cf422ed849
children f1b023fd098d
line wrap: on
line diff
--- a/liboctave/CMatrix.cc	Tue Sep 06 12:48:40 2011 -0500
+++ b/liboctave/CMatrix.cc	Tue Sep 06 14:58:44 2011 -0400
@@ -921,7 +921,7 @@
 ComplexMatrix
 conj (const ComplexMatrix& a)
 {
-  return do_mx_unary_map<Complex, Complex, std::conj> (a);
+  return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
 }
 
 // resize is the destructive equivalent for this one