Re: Compilation error in 1.5.66

[Mats Bengtsson]

> > Of course, but it doesn't mean we should abandon the support
> > for older versions immediately.
> 
> That is a matter of who's going to write the patch, and how good it
> looks.
> 
> > So far, it only involves a single file. I simply copied
> > source-file.cc from an older Lilypond and it seems to work well.
> 
> Hmm.  So it is really just source-file.cc?  In that case, I'd suggest
> to do something like:
> ...
> Would you like to produce a patch?  I'll take care of the HAVE_SSTREAM
> macro in configure.in, if you like.

OK, here comes a patch that works on my machine (without sstream).
I changed the stringstream of line 53 to an istringstream to make
the patch as simple as possible. Since you use an istringstream
anyway a few lines below, I hope it will work correctly, but
unfortunately I can't try it.
Yes please, I'd appreciate if you can take care of the HAVE_SSTREAM
macro.

   /Mats


Generated by (address unknown),
>From = lilypond-1.5.66, To = lilypond-1.5.66.mb1

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.66-1.5.66.mb1.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure

diff -purN ../lilypond-1.5.66/ChangeLog ./ChangeLog
--- ../lilypond-1.5.66/ChangeLog        Sun Jul  7 17:27:16 2002
+++ ./ChangeLog Tue Jul  9 23:21:24 2002
@@ -1,3 +1,7 @@
+2002-07-09  Mats Bengtsson  <address@hidden>
+
+       * flower/source-file.cc: Fix compatibility with older g++.
+
 2002-07-07  Han-Wen  <address@hidden>
 
        * VERSION: 1.5.66 released
diff -purN ../lilypond-1.5.66/VERSION ./VERSION
--- ../lilypond-1.5.66/VERSION  Sun Jul  7 15:45:39 2002
+++ ./VERSION   Tue Jul  9 23:21:49 2002
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=66
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff -purN ../lilypond-1.5.66/flower/source-file.cc ./flower/source-file.cc
--- ../lilypond-1.5.66/flower/source-file.cc    Sun Jul  7 15:44:56 2002
+++ ./flower/source-file.cc     Tue Jul  9 23:48:37 2002
@@ -9,7 +9,12 @@
 
 
 #include <assert.h>
+#if HAVE_SSTREAM
 #include <sstream>
+#else
+#include <strstream.h>
+#define istringstream(x) istrstream(x, length_i ()) 
+#endif
 
 #include "string.hh"
 #include "flower-proto.hh"
@@ -45,7 +50,7 @@ Source_file::istream_l ()
   if (!istream_p_)
     {
       if (length_i ()) // can-t this be done without such a hack?
-       istream_p_ = new std::stringstream (ch_C ());
+       istream_p_ = new std::istringstream (ch_C ());
       else
        {
          istream_p_ = new std::istringstream ("");