*** old-octave/src/oct-stream.h	2007-02-10 08:10:42.000000000 +0100
--- octave/src/oct-stream.h	2007-06-24 22:34:49.000000000 +0200
***************
*** 32,37 ****
--- 32,38 ----
  #include <iostream>
  #include <sstream>
  #include <string>
+ #include <map>
  
  #include "Array.h"
  #include "data-conv.h"
***************
*** 622,628 ****
  {
  protected:
  
!   octave_stream_list (void) : list (32), curr_len (0) { }
  
  public:
  
--- 623,629 ----
  {
  protected:
  
!   octave_stream_list (void) : list () { }
  
  public:
  
***************
*** 630,636 ****
  
    static bool instance_ok (void);
  
!   static int insert (const octave_stream& os);
  
    static octave_stream
    lookup (int fid, const std::string& who = std::string ());
--- 631,637 ----
  
    static bool instance_ok (void);
  
!   static int insert (octave_stream& os);
  
    static octave_stream
    lookup (int fid, const std::string& who = std::string ());
***************
*** 655,667 ****
  
  private:
  
!   Array<octave_stream> list;
  
!   int curr_len;
  
    static octave_stream_list *instance;
  
!   int do_insert (const octave_stream& os);
  
    octave_stream do_lookup (int fid, const std::string& who = std::string ()) const;
    octave_stream do_lookup (const octave_value& fid,
--- 656,668 ----
  
  private:
  
!   typedef std::map<int, octave_stream> ostrl_map;
  
!   ostrl_map list;
  
    static octave_stream_list *instance;
  
!   int do_insert (octave_stream& os);
  
    octave_stream do_lookup (int fid, const std::string& who = std::string ()) const;
    octave_stream do_lookup (const octave_value& fid,