changeset 7889:76142609e8d2

Remove some float-functions ambiguities.
author John W. Eaton <jwe@octave.org>
date Fri, 13 Jun 2008 13:55:16 -0400
parents c123bd09172e
children 73ef513855e7
files liboctave/ChangeLog liboctave/fCmplxDET.cc liboctave/lo-mappers.cc
diffstat 3 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Thu Jun 12 17:02:53 2008 +0200
+++ b/liboctave/ChangeLog	Fri Jun 13 13:55:16 2008 -0400
@@ -1,3 +1,8 @@
+2008-06-13  Michael Goffioul  <michael.goffioul@gmail.com>
+
+	* lo-mappers.cc (arg): Remove ambiguity about atan2(float,float) usage.
+	* fCmplxDET.cc (FloatComplexDET::initialize10): Likewise, for pow.
+
 2008-06-11  John W. Eaton  <jwe@octave.org>
 
 	* so-array.h, so-array.cc, Array-so.cc: Delete.
--- a/liboctave/fCmplxDET.cc	Thu Jun 12 17:02:53 2008 +0200
+++ b/liboctave/fCmplxDET.cc	Fri Jun 13 13:55:16 2008 -0400
@@ -57,7 +57,7 @@
       float etmp = e2 / xlog2 (static_cast<float>(10));
       e10 = static_cast<int> (xround (etmp));
       etmp -= e10;
-      c10 = c2 * static_cast<float> (pow (10.0, etmp));
+      c10 = c2 * static_cast<float> (pow (10.0f, etmp));
     }
 }
 
--- a/liboctave/lo-mappers.cc	Thu Jun 12 17:02:53 2008 +0200
+++ b/liboctave/lo-mappers.cc	Fri Jun 13 13:55:16 2008 -0400
@@ -402,7 +402,7 @@
 float
 arg (float x)
 {
-  return atan2 (0.0, x);
+  return atan2 (0.0f, x);
 }
 
 float