Mercurial > hg > octave-avbm

diff src/data.cc @ 2672:e93b4c32457b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-02-13 20:34:48 by jwe]
author jwe
date Thu, 13 Feb 1997 20:34:48 +0000 (1997-02-13)
parents 449f35baba49
children 9aeba8e006a4
line wrap: on
line diff
--- a/src/data.cc
+++ b/src/data.cc
@@ -99,7 +99,7 @@
 typedef double (*d_dd_fcn) (double, double);
 
 static Matrix
-map (d_dd_fcn f, double x, const Matrix& y)
+map_d_m (d_dd_fcn f, double x, const Matrix& y)
 {
   int nr = y.rows ();
   int nc = y.columns ();
@@ -114,7 +114,7 @@
 }
 
 static Matrix
-map (d_dd_fcn f, const Matrix& x, double y)
+map_m_d (d_dd_fcn f, const Matrix& x, double y)
 {
   int nr = x.rows ();
   int nc = x.columns ();
@@ -129,7 +129,7 @@
 }
 
 static Matrix
-map (d_dd_fcn f, const Matrix& x, const Matrix& y)
+map_m_m (d_dd_fcn f, const Matrix& x, const Matrix& y)
 {
   int x_nr = x.rows ();
   int x_nc = x.columns ();
@@ -198,7 +198,7 @@
 	      Matrix x = arg_x.matrix_value ();
 
 	      if (! error_state)
-		retval = map (atan2, y, x);
+		retval = map_d_m (atan2, y, x);
 	    }
 	}
       else if (x_is_scalar)
@@ -210,7 +210,7 @@
 	      double x = arg_x.double_value ();
 
 	      if (! error_state)
-		retval = map (atan2, y, x);
+		retval = map_m_d (atan2, y, x);
 	    }
 	}
       else if (y_nr == x_nr && y_nc == x_nc)
@@ -222,7 +222,7 @@
 	      Matrix x = arg_x.matrix_value ();
 
 	      if (! error_state)
-		retval = map (atan2, y, x);
+		retval = map_m_m (atan2, y, x);
 	    }
 	}
       else