# HG changeset patch
# User Júlio Hoffimann <julio.hoffimann@gmail.com>
# Date 1315335524 14400
# Node ID 353c71c76f22dc8dfd82f57e29f2c9bdb5526cff
# Parent  3d7a4a2d9cef6d2eb9820b656e554db024cef9c3
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>.

diff -r 3d7a4a2d9cef -r 353c71c76f22 liboctave/CColVector.cc
--- a/liboctave/CColVector.cc	Tue Sep 06 12:48:40 2011 -0500
+++ b/liboctave/CColVector.cc	Tue Sep 06 14:58:44 2011 -0400
@@ -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
diff -r 3d7a4a2d9cef -r 353c71c76f22 liboctave/CMatrix.cc
--- 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
diff -r 3d7a4a2d9cef -r 353c71c76f22 liboctave/CNDArray.cc
--- a/liboctave/CNDArray.cc	Tue Sep 06 12:48:40 2011 -0500
+++ b/liboctave/CNDArray.cc	Tue Sep 06 14:58:44 2011 -0400
@@ -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&
diff -r 3d7a4a2d9cef -r 353c71c76f22 liboctave/CRowVector.cc
--- a/liboctave/CRowVector.cc	Tue Sep 06 12:48:40 2011 -0500
+++ b/liboctave/CRowVector.cc	Tue Sep 06 14:58:44 2011 -0400
@@ -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
diff -r 3d7a4a2d9cef -r 353c71c76f22 liboctave/fCColVector.cc
--- a/liboctave/fCColVector.cc	Tue Sep 06 12:48:40 2011 -0500
+++ b/liboctave/fCColVector.cc	Tue Sep 06 14:58:44 2011 -0400
@@ -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
diff -r 3d7a4a2d9cef -r 353c71c76f22 liboctave/fCMatrix.cc
--- a/liboctave/fCMatrix.cc	Tue Sep 06 12:48:40 2011 -0500
+++ b/liboctave/fCMatrix.cc	Tue Sep 06 14:58:44 2011 -0400
@@ -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
diff -r 3d7a4a2d9cef -r 353c71c76f22 liboctave/fCNDArray.cc
--- a/liboctave/fCNDArray.cc	Tue Sep 06 12:48:40 2011 -0500
+++ b/liboctave/fCNDArray.cc	Tue Sep 06 14:58:44 2011 -0400
@@ -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&
diff -r 3d7a4a2d9cef -r 353c71c76f22 liboctave/fCRowVector.cc
--- a/liboctave/fCRowVector.cc	Tue Sep 06 12:48:40 2011 -0500
+++ b/liboctave/fCRowVector.cc	Tue Sep 06 14:58:44 2011 -0400
@@ -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
diff -r 3d7a4a2d9cef -r 353c71c76f22 src/ov-cx-sparse.cc
--- a/src/ov-cx-sparse.cc	Tue Sep 06 12:48:40 2011 -0500
+++ b/src/ov-cx-sparse.cc	Tue Sep 06 14:58:44 2011 -0400
@@ -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);