Mercurial > hg > octave-nkf

diff src/ls-mat5.cc @ 7198:4555c116b420

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-11-27 03:06:10 by jwe]
author jwe
date Tue, 27 Nov 2007 03:06:10 +0000
parents a1dbe9d80eee
children 745a8299c2b5
line wrap: on
line diff
--- a/src/ls-mat5.cc
+++ b/src/ls-mat5.cc
@@ -334,7 +334,7 @@
 	    ComplexNDArray ctmp (dims); \
   \
 	    for (int i = 0; i < n; i++) \
-	      ctmp(i) = Complex (double (re(i)), im(i)); \
+	      ctmp(i) = Complex (re(i).double_value (), im(i)); \
   \
             tc = ctmp;  \
 	  } \
@@ -863,7 +863,7 @@
 	  {
 	    Octave_map m2 = m1.contents("workspace")(0).map_value();
 	    uint32NDArray MCOS = m2.contents("MCOS")(0).uint32_array_value();
-	    octave_idx_type off = static_cast<octave_idx_type>(double (MCOS (4)));
+	    octave_idx_type off = static_cast<octave_idx_type>(MCOS(4).double_value ());
 	    m2 = subsys_ov.map_value();
 	    m2 = m2.contents("MCOS")(0).map_value();
 	    tc2 = m2.contents("MCOS")(0).cell_value()(1 + off).cell_value()(1);
@@ -1140,7 +1140,7 @@
 	    boolNDArray out (dims);
 	    
 	    for (int i = 0; i < nel; i++)
-	      out (i) = static_cast<bool> (double (in (i)));
+	      out (i) = in(i).bool_value ();
 
 	    tc = out;
 	  }
@@ -1377,7 +1377,7 @@
 	  // FIXME -- find a way to avoid casting away const here
 	  char *ctmp = const_cast<char *> (outbuf.c_str ());
 	  for (octave_idx_type j = 8; j < ilen; j++)
-	    ctmp [j - 8] = itmp (j);
+	    ctmp[j-8] = itmp(j).char_value ();
 
 	  std::istringstream fh_ws (outbuf);