Current CVS won't compile on my machine due to a problem with
insets/insetinclude.C : in line 205, ost.str() was changed to
ost.str().c_str().

In my system, (HAVE_SSTREAM undefined), ost.str() already returns char*,
and the code won't compile. I think the following is the correct fix.

Lior.

PS: Apologies for the set_color bug. I dumbly copied code without trying
to understand how it should work.


Index: insetinclude.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetinclude.C,v
retrieving revision 1.34
diff -u -u -r1.34 insetinclude.C
--- insetinclude.C      2000/07/25 10:46:17     1.34
+++ insetinclude.C      2000/07/25 16:09:33
@@ -195,14 +195,14 @@
 #ifdef HAVE_SSTREAM
        std::ostringstream ost;
        ost << "file" << ++seed;
+       return ost.str().c_str();
 #else
        char ctmp[16];
        ostrstream ost(ctmp,16);
        ost << "file" << ++seed << '\0';
+       return ost.str();
 #endif
 
-       // Needed if we use lyxstring.
-       return ost.str().c_str();
 }

Reply via email to