From octave-maintainers-request at bevo dot che dot wisc dot edu Fri Dec  6 15:49:57 2002
Subject: CVS Octave is now Pix-free
From: "John W. Eaton" <jwe at bevo dot che dot wisc dot edu>
To: octave-maintainers mailing list <octave-maintainers at bevo dot che dot wisc dot edu>
cc: Andy Adler <adler at site dot uottawa dot ca>
Date: Fri, 6 Dec 2002 15:49:15 -0600

I've just checked in some changes that replace all uses of the old
libg++ SLList, SLStack, CHMap, DLList, etc. classes with corresponding
standard C++ STL classes.  This probably means that g++ 3.2 or some
simlarly capable compiler is now needed to build Octave.

The sparse matrix code in octave-forge will also need the patch below.
In this particular case, all that was required was substituting
std::list for SLList, but it's not always that simple because the
SLList interface is different from std::list.

The mex compatibility code in octave-forge will also have to be
changed because including <octave/SLList.h> will no longer work.  For
now, it might be best to just copy the files that are needed from
octave-2.1.40.  Longer term, we will probably want to switch to STL
containers.

jwe



Index: complex_sparse_ops.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/sparse/complex_sparse_ops.cc,v
retrieving revision 1.10
diff -u -r1.10 complex_sparse_ops.cc
--- complex_sparse_ops.cc	27 Nov 2002 04:46:42 -0000	1.10
+++ complex_sparse_ops.cc	6 Dec 2002 19:35:38 -0000
 at @ -460,7 +460,7 @@
 
 octave_value_list
 octave_complex_sparse::subsref( const std::string type,
-                        const SLList<octave_value_list>& idx,
+                        const std::list<octave_value_list>& idx,
                         int nargout)
 {
 // octave_value retval;
Index: make_sparse.h
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/sparse/make_sparse.h,v
retrieving revision 1.10
diff -u -r1.10 make_sparse.h
--- make_sparse.h	27 Nov 2002 04:46:42 -0000	1.10
+++ make_sparse.h	6 Dec 2002 19:35:38 -0000
 at @ -183,7 +183,7 @@
 
    octave_value extract (int r1, int c1, int r2, int c2) const ;
    octave_value_list subsref (const std::string type,
-                              const SLList<octave_value_list>& idx,
+                              const std::list<octave_value_list>& idx,
                               int nargout);
    octave_value do_index_op ( const octave_value_list& idx);
    
 at @ -242,11 +242,11 @@
 
    octave_value extract (int r1, int c1, int r2, int c2) const ;
    octave_value_list subsref (const std::string type,
-                              const SLList<octave_value_list>& idx,
+                              const std::list<octave_value_list>& idx,
                               int nargout);
 #if 0
    octave_value subsref( const std::string type,
-                         const SLList<octave_value_list>& idx);
+                         const std::list<octave_value_list>& idx);
 #endif
    octave_value do_index_op ( const octave_value_list& idx);
 
Index: sparse_ops.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/sparse/sparse_ops.cc,v
retrieving revision 1.8
diff -u -r1.8 sparse_ops.cc
--- sparse_ops.cc	27 Nov 2002 04:46:42 -0000	1.8
+++ sparse_ops.cc	6 Dec 2002 19:35:39 -0000
 at @ -412,7 +412,7 @@
 
 octave_value_list
 octave_sparse::subsref( const std::string type,
-                        const SLList<octave_value_list>& idx,
+                        const std::list<octave_value_list>& idx,
                         int nargout)
 {
 // octave_value retval;