Mercurial > hg > octave-terminal
changeset 13107:353c71c76f22
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 | 3d7a4a2d9cef |
children | d44d7f3c7998 |
files | liboctave/CColVector.cc liboctave/CMatrix.cc liboctave/CNDArray.cc liboctave/CRowVector.cc liboctave/fCColVector.cc liboctave/fCMatrix.cc liboctave/fCNDArray.cc liboctave/fCRowVector.cc src/ov-cx-sparse.cc |
diffstat | 9 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/CColVector.cc +++ b/liboctave/CColVector.cc @@ -242,7 +242,7 @@ ComplexColumnVector conj (const ComplexColumnVector& 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
--- a/liboctave/CMatrix.cc +++ b/liboctave/CMatrix.cc @@ -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
--- a/liboctave/CNDArray.cc +++ b/liboctave/CNDArray.cc @@ -760,7 +760,7 @@ ComplexNDArray conj (const ComplexNDArray& a) { - return do_mx_unary_map<Complex, Complex, std::conj> (a); + return do_mx_unary_map<Complex, Complex, std::conj<double> > (a); } ComplexNDArray&
--- a/liboctave/CRowVector.cc +++ b/liboctave/CRowVector.cc @@ -234,7 +234,7 @@ ComplexRowVector conj (const ComplexRowVector& 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
--- a/liboctave/fCColVector.cc +++ b/liboctave/fCColVector.cc @@ -242,7 +242,7 @@ FloatComplexColumnVector conj (const FloatComplexColumnVector& a) { - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj> (a); + return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a); } // resize is the destructive equivalent for this one
--- a/liboctave/fCMatrix.cc +++ b/liboctave/fCMatrix.cc @@ -923,7 +923,7 @@ FloatComplexMatrix conj (const FloatComplexMatrix& a) { - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj> (a); + return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a); } // resize is the destructive equivalent for this one
--- a/liboctave/fCNDArray.cc +++ b/liboctave/fCNDArray.cc @@ -757,7 +757,7 @@ FloatComplexNDArray conj (const FloatComplexNDArray& a) { - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj> (a); + return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a); } FloatComplexNDArray&
--- a/liboctave/fCRowVector.cc +++ b/liboctave/fCRowVector.cc @@ -234,7 +234,7 @@ FloatComplexRowVector conj (const FloatComplexRowVector& a) { - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj> (a); + return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a); } // resize is the destructive equivalent for this one
--- a/src/ov-cx-sparse.cc +++ b/src/ov-cx-sparse.cc @@ -904,7 +904,7 @@ ARRAY_MAPPER (atan, Complex, ::atan); ARRAY_MAPPER (atanh, Complex, ::atanh); ARRAY_MAPPER (ceil, Complex, ::ceil); - ARRAY_MAPPER (conj, Complex, std::conj); + ARRAY_MAPPER (conj, Complex, std::conj<double>); ARRAY_MAPPER (cos, Complex, std::cos); ARRAY_MAPPER (cosh, Complex, std::cosh); ARRAY_MAPPER (exp, Complex, std::exp);