installing octave/cvs under slack-10.1

[John W. Eaton]

On  6-Jan-2006, Jorge Barros de Abreu wrote:

| I am trying to install octave/cvs under slack-10.1 and was 
| occuring the following error
| 
| oct-map.cc: In member function `Octave_map Octave_map::transpose() const':
| oct-map.cc:95: error: parse error before `,' token
| oct-map.cc:98: error: request for member `assign' in `retval', which is of
|    non-aggregate type `Octave_map ()(...)'
| oct-map.cc:100: error: conversion from `Octave_map (*)(...)' to non-scalar 
| type
|    `Octave_map' requested
| make[2]: ** [pic/oct-map.o] Erro 1
| make[2]: Leaving directory `~/tmpdir/octave/src'
| make[1]: ** [src] Erro 2
| make[1]: Leaving directory `~/tmp/octave'
| make: ** [all] Erro 2

Does the following change avoid the parse error?

jwe

Index: src/oct-map.cc
===================================================================
RCS file: /cvs/octave/src/oct-map.cc,v
retrieving revision 1.46
diff -u -r1.46 oct-map.cc
--- src/oct-map.cc      12 Dec 2005 20:45:17 -0000      1.46
+++ src/oct-map.cc      6 Jan 2006 15:47:05 -0000
@@ -90,9 +90,15 @@
 Octave_map::transpose (void) const
 {
   assert (ndims () == 2);
+
   dim_vector dv = dims ();
 
-  Octave_map retval (dim_vector (dv(1), dv(0)));
+  octave_idx_type nr = dv(0);
+  octave_idx_type nc = dv(1);
+
+  dim_vector new_dims (nc, nr);
+
+  Octave_map retval (new_dims);
 
   for (const_iterator p = begin (); p != end (); p++)
     retval.assign (key(p), Cell (contents(p).transpose ()));



-------------------------------------------------------------
Octave is freely available under the terms of the GNU GPL.

Octave's home on the web:  http://www.octave.org
How to fund new projects:  http://www.octave.org/funding.html
Subscription information:  http://www.octave.org/archive.html
-------------------------------------------------------------