* configure.in: Add check for sstream header.
* flower/source-file.cc: Fix compatibility with older g++. (Mats)
+2002-07-10 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * config.hh.in: Add HAVE_SSTREAM.
+
+ * configure.in: Add check for sstream header.
+
+2002-07-09 Mats Bengtsson <matsb@s3.kth.se>
+
+ * flower/source-file.cc: Fix compatibility with older g++.
+
2002-07-09 Jan Nieuwenhuizen <janneke@gnu.org>
* input/twinkle.ly: Bugfix: no automaticMelismata.
sdesc: "A program for printing sheet music"
category: Publishing
-requires: ash bash libguile14 libintl2 python tetex-beta texmf-tiny
+# actually, guile needs libtool-devel
+requires: ash bash libguile14 libintl2 libtool-devel python tetex-beta texmf-tiny
#suggests: emacs gsview lilypond-doc rxvt xdvi texmf-base
ldesc: "A program for printing sheet music.
LilyPond prints beautiful sheet music. It produces music notation
MAJOR_VERSION=1
MINOR_VERSION=5
PATCH_LEVEL=66
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
# Use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
/* define if you have sys/stat.h */
#define STAT_MACROS_BROKEN 0
+/* define if you have sstream */
+#define HAVE_SSTREAM 0
/* GUILE only includes version in headers (libguile/version.h) as of
1.5.x. For some strange reason, they call it SCM.*VERSION. */
STEPMAKE_PYTHON_DEVEL(REQUIRED)
-# AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h)
-AC_HAVE_HEADERS(assert.h sys/stat.h)
+AC_HAVE_HEADERS(assert.h sys/stat.h sstream)
AC_HEADER_STAT
AC_FUNC_MEMCMP
#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"
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 ("");