I noticed that we in some places used <sstream> directly and not
"support/std_sstream.h". If we ever had HAVE_SSTREAM == false this
would have errored out. So since we have not seen this error, I took
the oppurtunity to get rid of the std_sstream stuff.
The patch below does not remove the now unneeded files, but a final
commit will do that if we agree to apply this patch.
(I think it should be ok.)
? 1
? Config
? counter-2.diff
? counter-3.diff
? counter.diff
? deptherror.diff
? deptherror.lyx
? dispatch-2.diff
? dispatch-3.diff
? dispatch-4.diff
? distcheck-2.diff
? distcheck.diff
? end.lyx
? kystskipper-a-1.lyx
? lyxserver-1.diff
? lyxserver-2.diff
? lyxserver-3.diff
? mathwarn-1.diff
? morectrs.lyx
? output
? refenum.lyx
? sockcrash-1.diff
? sstream-1.diff
? unneeded.diff
? intl/CTAGS
Index: config/common.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/common.am,v
retrieving revision 1.6
diff -u -p -b -r1.6 common.am
--- config/common.am 7 May 2003 16:22:00 -0000 1.6
+++ config/common.am 23 Jul 2004 23:35:47 -0000
@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
-ETAGS_ARGS = --lang=c++
+AM_ETAGSFLAGS = --lang=c++
if USE_INCLUDED_BOOST
BOOST_INCLUDES = -I$(top_srcdir)/boost
Index: src/LaTeXFeatures.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LaTeXFeatures.C,v
retrieving revision 1.111
diff -u -p -b -r1.111 LaTeXFeatures.C
--- src/LaTeXFeatures.C 23 Jul 2004 16:03:39 -0000 1.111
+++ src/LaTeXFeatures.C 23 Jul 2004 23:35:47 -0000
@@ -27,7 +27,7 @@
#include "support/filetools.h"
-#include "support/std_sstream.h"
+#include <sstream>
using lyx::support::IsSGMLFilename;
using lyx::support::MakeRelPath;
Index: src/ParagraphParameters.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ParagraphParameters.C,v
retrieving revision 1.40
diff -u -p -b -r1.40 ParagraphParameters.C
--- src/ParagraphParameters.C 8 Apr 2004 15:03:25 -0000 1.40
+++ src/ParagraphParameters.C 23 Jul 2004 23:35:47 -0000
@@ -28,7 +28,8 @@
#include "frontends/LyXView.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::support::rtrim;
Index: src/Spacing.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Spacing.C,v
retrieving revision 1.34
diff -u -p -b -r1.34 Spacing.C
--- src/Spacing.C 15 Feb 2004 20:05:17 -0000 1.34
+++ src/Spacing.C 23 Jul 2004 23:35:47 -0000
@@ -10,11 +10,11 @@
*/
#include <config.h>
-#include <string>
#include "Spacing.h"
-#include "support/std_sstream.h"
+#include <sstream>
+#include <string>
using std::ios;
using std::istringstream;
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.578
diff -u -p -b -r1.578 buffer.C
--- src/buffer.C 1 Jul 2004 14:40:59 -0000 1.578
+++ src/buffer.C 23 Jul 2004 23:35:47 -0000
@@ -71,14 +71,15 @@
#include "support/path.h"
#include "support/textutils.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
#include <boost/bind.hpp>
+#include <utime.h>
+
#include <iomanip>
#include <stack>
+#include <sstream>
-#include <utime.h>
using lyx::pos_type;
using lyx::par_type;
Index: src/bufferparams.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/bufferparams.C,v
retrieving revision 1.83
diff -u -p -b -r1.83 bufferparams.C
--- src/bufferparams.C 27 Jun 2004 13:14:08 -0000 1.83
+++ src/bufferparams.C 23 Jul 2004 23:35:47 -0000
@@ -41,7 +41,7 @@
#include <boost/array.hpp>
-#include "support/std_sstream.h"
+#include <sstream>
namespace support = lyx::support;
using lyx::support::bformat;
Index: src/bufferview_funcs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/bufferview_funcs.C,v
retrieving revision 1.141
diff -u -p -b -r1.141 bufferview_funcs.C
--- src/bufferview_funcs.C 28 Mar 2004 22:00:21 -0000 1.141
+++ src/bufferview_funcs.C 23 Jul 2004 23:35:47 -0000
@@ -35,7 +35,8 @@
#include "insets/insettext.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::support::bformat;
Index: src/counters.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/counters.C,v
retrieving revision 1.30
diff -u -p -b -r1.30 counters.C
--- src/counters.C 5 Apr 2004 09:36:19 -0000 1.30
+++ src/counters.C 23 Jul 2004 23:35:47 -0000
@@ -16,10 +16,11 @@
#include "debug.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
#include "support/tostr.h"
#include <boost/assert.hpp>
+
+#include <sstream>
using std::endl;
using std::ostringstream;
Index: src/cursor.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/cursor.C,v
retrieving revision 1.102
diff -u -p -b -r1.102 cursor.C
--- src/cursor.C 18 Jun 2004 13:31:53 -0000 1.102
+++ src/cursor.C 23 Jul 2004 23:35:48 -0000
@@ -40,11 +40,12 @@
#include "mathed/math_macrotable.h"
#include "support/limited_stack.h"
-#include "support/std_sstream.h"
#include "frontends/LyXView.h"
#include <boost/assert.hpp>
+
+#include <sstream>
using lyx::par_type;
Index: src/factory.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/factory.C,v
retrieving revision 1.93
diff -u -p -b -r1.93 factory.C
--- src/factory.C 29 Apr 2004 14:48:59 -0000 1.93
+++ src/factory.C 23 Jul 2004 23:35:48 -0000
@@ -60,9 +60,10 @@
#include "frontends/LyXView.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
#include <boost/assert.hpp>
+
+#include <sstream>
using lyx::support::compare_ascii_no_case;
Index: src/funcrequest.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/funcrequest.C,v
retrieving revision 1.23
diff -u -p -b -r1.23 funcrequest.C
--- src/funcrequest.C 3 Apr 2004 08:36:57 -0000 1.23
+++ src/funcrequest.C 23 Jul 2004 23:35:48 -0000
@@ -12,9 +12,8 @@
#include "funcrequest.h"
-#include "support/std_sstream.h"
-
#include <iostream>
+#include <sstream>
#include <vector>
using std::getline;
Index: src/kbmap.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/kbmap.C,v
retrieving revision 1.55
diff -u -p -b -r1.55 kbmap.C
--- src/kbmap.C 7 Jul 2004 09:32:18 -0000 1.55
+++ src/kbmap.C 23 Jul 2004 23:35:48 -0000
@@ -23,7 +23,8 @@
#include "frontends/LyXKeySym.h"
#include "support/filetools.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::support::i18nLibFileSearch;
Index: src/lyxfind.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfind.C,v
retrieving revision 1.83
diff -u -p -b -r1.83 lyxfind.C
--- src/lyxfind.C 3 Apr 2004 08:36:57 -0000 1.83
+++ src/lyxfind.C 23 Jul 2004 23:35:48 -0000
@@ -33,7 +33,7 @@
#include "support/textutils.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
+#include <sstream>
using lyx::support::lowercase;
using lyx::support::uppercase;
Index: src/lyxfont.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfont.C,v
retrieving revision 1.106
diff -u -p -b -r1.106 lyxfont.C
--- src/lyxfont.C 21 Oct 2003 16:15:09 -0000 1.106
+++ src/lyxfont.C 23 Jul 2004 23:35:48 -0000
@@ -25,7 +25,8 @@
#include "lyxrc.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::support::ascii_lowercase;
using lyx::support::bformat;
Index: src/lyxfunc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.621
diff -u -p -b -r1.621 lyxfunc.C
--- src/lyxfunc.C 2 Jul 2004 10:03:22 -0000 1.621
+++ src/lyxfunc.C 23 Jul 2004 23:35:48 -0000
@@ -87,9 +87,10 @@
#include "support/path_defines.h"
#include "support/systemcall.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
#include "support/os.h"
+#include <sstream>
+
using bv_funcs::freefont2string;
using lyx::support::AddName;
Index: src/lyxgluelength.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxgluelength.C,v
retrieving revision 1.13
diff -u -p -b -r1.13 lyxgluelength.C
--- src/lyxgluelength.C 6 Oct 2003 15:42:26 -0000 1.13
+++ src/lyxgluelength.C 23 Jul 2004 23:35:48 -0000
@@ -15,7 +15,7 @@
#include "lyxgluelength.h"
#include "lengthcommon.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::ostringstream;
using std::string;
Index: src/lyxlength.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxlength.C,v
retrieving revision 1.35
diff -u -p -b -r1.35 lyxlength.C
--- src/lyxlength.C 20 Apr 2004 08:51:10 -0000 1.35
+++ src/lyxlength.C 23 Jul 2004 23:35:48 -0000
@@ -19,8 +19,8 @@
#include "lengthcommon.h"
#include "lyxrc.h"
+#include <sstream>
-#include "support/std_sstream.h"
using std::abs;
using std::ostringstream;
Index: src/paragraph.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph.C,v
retrieving revision 1.369
diff -u -p -b -r1.369 paragraph.C
--- src/paragraph.C 29 Jun 2004 15:43:25 -0000 1.369
+++ src/paragraph.C 23 Jul 2004 23:35:48 -0000
@@ -41,7 +41,6 @@
#include "insets/insetoptarg.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
#include "support/textutils.h"
#include "support/tostr.h"
@@ -50,6 +49,7 @@
#include <list>
#include <stack>
+#include <sstream>
using lyx::pos_type;
Index: src/paragraph_funcs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph_funcs.C,v
retrieving revision 1.104
diff -u -p -b -r1.104 paragraph_funcs.C
--- src/paragraph_funcs.C 17 May 2004 11:28:27 -0000 1.104
+++ src/paragraph_funcs.C 23 Jul 2004 23:35:49 -0000
@@ -30,8 +30,8 @@
#include "support/filetools.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
-#include "support/std_sstream.h"
+#include <sstream>
#include <vector>
using lyx::pos_type;
Index: src/tabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tabular.C,v
retrieving revision 1.207
diff -u -p -b -r1.207 tabular.C
--- src/tabular.C 25 Mar 2004 09:16:21 -0000 1.207
+++ src/tabular.C 23 Jul 2004 23:35:49 -0000
@@ -32,7 +32,7 @@
#include "support/lstrings.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
+#include <sstream>
using lyx::support::ltrim;
using lyx::support::prefixIs;
Index: src/text.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text.C,v
retrieving revision 1.565
diff -u -p -b -r1.565 text.C
--- src/text.C 29 Jun 2004 15:43:25 -0000 1.565
+++ src/text.C 23 Jul 2004 23:35:49 -0000
@@ -66,7 +66,8 @@
#include "support/lstrings.h"
#include "support/textutils.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::par_type;
using lyx::pos_type;
Index: src/text2.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text2.C,v
retrieving revision 1.575
diff -u -p -b -r1.575 text2.C
--- src/text2.C 2 Jul 2004 10:11:14 -0000 1.575
+++ src/text2.C 23 Jul 2004 23:35:50 -0000
@@ -58,7 +58,8 @@
#include "support/lstrings.h"
#include "support/textutils.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::par_type;
using lyx::pos_type;
Index: src/text3.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text3.C,v
retrieving revision 1.253
diff -u -p -b -r1.253 text3.C
--- src/text3.C 18 May 2004 07:18:02 -0000 1.253
+++ src/text3.C 23 Jul 2004 23:35:50 -0000
@@ -54,12 +54,12 @@
#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
#include "mathed/math_hullinset.h"
#include "mathed/math_macrotemplate.h"
#include <clocale>
+#include <sstream>
using lyx::pos_type;
Index: src/frontends/controllers/ControlAboutlyx.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlAboutlyx.C,v
retrieving revision 1.26
diff -u -p -b -r1.26 ControlAboutlyx.C
--- src/frontends/controllers/ControlAboutlyx.C 19 May 2004 15:11:30 -0000 1.26
+++ src/frontends/controllers/ControlAboutlyx.C 23 Jul 2004 23:35:50 -0000
@@ -14,12 +14,12 @@
#include "ControlAboutlyx.h"
#include "gettext.h"
#include "version.h"
-#include "support/std_sstream.h"
#include "support/filetools.h" // FileSearch
#include "support/path_defines.h"
#include <fstream>
+#include <sstream>
using std::ostream;
using std::ostringstream;
Index: src/frontends/controllers/ControlDocument.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlDocument.C,v
retrieving revision 1.52
diff -u -p -b -r1.52 ControlDocument.C
--- src/frontends/controllers/ControlDocument.C 19 May 2004 15:11:30 -0000 1.52
+++ src/frontends/controllers/ControlDocument.C 23 Jul 2004 23:35:50 -0000
@@ -21,7 +21,7 @@
#include "LColor.h"
#include "lyxtextclasslist.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::ostringstream;
using std::string;
Index: src/frontends/controllers/ControlLog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlLog.C,v
retrieving revision 1.23
diff -u -p -b -r1.23 ControlLog.C
--- src/frontends/controllers/ControlLog.C 19 May 2004 15:11:30 -0000 1.23
+++ src/frontends/controllers/ControlLog.C 23 Jul 2004 23:35:50 -0000
@@ -16,8 +16,7 @@
#include "gettext.h"
#include "lyxlex.h"
-#include "support/std_sstream.h"
-
+#include <sstream>
#include <fstream>
using std::istringstream;
Index: src/frontends/controllers/ControlParagraph.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlParagraph.C,v
retrieving revision 1.29
diff -u -p -b -r1.29 ControlParagraph.C
--- src/frontends/controllers/ControlParagraph.C 19 May 2004 15:11:30 -0000 1.29
+++ src/frontends/controllers/ControlParagraph.C 23 Jul 2004 23:35:50 -0000
@@ -17,8 +17,8 @@
#include "lyxlex.h"
#include "paragraph.h"
#include "ParagraphParameters.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::istringstream;
using std::ostringstream;
Index: src/frontends/controllers/ControlPrefs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlPrefs.C,v
retrieving revision 1.29
diff -u -p -b -r1.29 ControlPrefs.C
--- src/frontends/controllers/ControlPrefs.C 19 May 2004 15:11:30 -0000 1.29
+++ src/frontends/controllers/ControlPrefs.C 23 Jul 2004 23:35:50 -0000
@@ -24,7 +24,7 @@
#include "support/globbing.h"
#include "support/path_defines.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::ostringstream;
using std::pair;
Index: src/frontends/controllers/biblio.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/biblio.C,v
retrieving revision 1.67
diff -u -p -b -r1.67 biblio.C
--- src/frontends/controllers/biblio.C 19 May 2004 15:11:31 -0000 1.67
+++ src/frontends/controllers/biblio.C 23 Jul 2004 23:35:51 -0000
@@ -18,11 +18,11 @@
#include "gettext.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
#include <boost/regex.hpp>
#include <algorithm>
+#include <sstream>
using std::string;
using std::ostringstream;
Index: src/frontends/gnome/GAbout.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gnome/GAbout.C,v
retrieving revision 1.10
diff -u -p -b -r1.10 GAbout.C
--- src/frontends/gnome/GAbout.C 5 Sep 2003 18:02:17 -0000 1.10
+++ src/frontends/gnome/GAbout.C 23 Jul 2004 23:35:51 -0000
@@ -12,7 +12,6 @@
#include <config.h>
#include "support/lstrings.h"
-#include "support/std_sstream.h"
#include "gnome_helpers.h"
#include "gnomeBC.h"
@@ -20,6 +19,8 @@
#include <gtkmm/button.h>
#include <gtkmm/textview.h>
+
+#include <sstream>
using std::istringstream;
Index: src/frontends/gnome/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gnome/lyx_gui.C,v
retrieving revision 1.8
diff -u -p -b -r1.8 lyx_gui.C
--- src/frontends/gnome/lyx_gui.C 21 Sep 2003 16:02:53 -0000 1.8
+++ src/frontends/gnome/lyx_gui.C 23 Jul 2004 23:35:51 -0000
@@ -38,10 +38,11 @@
#include "xfont_loader.h"
#include "xformsImage.h"
-#include "support/std_sstream.h"
+#include <boost/bind.hpp>
+
+#include <sstream>
#include <iomanip>
#include <fcntl.h>
-#include <boost/bind.hpp>
#include "gnome_helpers.h"
#include <gtkmm/main.h>
Index: src/frontends/gtk/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/lyx_gui.C,v
retrieving revision 1.17
diff -u -p -b -r1.17 lyx_gui.C
--- src/frontends/gtk/lyx_gui.C 22 Jul 2004 13:44:39 -0000 1.17
+++ src/frontends/gtk/lyx_gui.C 23 Jul 2004 23:35:51 -0000
@@ -47,12 +47,14 @@
#include "xftFontLoader.h"
#include "GWorkArea.h"
-#include "support/std_sstream.h"
-#include <iomanip>
-#include <fcntl.h>
#include <boost/bind.hpp>
#include <boost/function.hpp>
#include <boost/shared_ptr.hpp>
+
+#include <fcntl.h>
+
+#include <sstream>
+#include <iomanip>
//just for xforms
#include "lyx_forms.h"
Index: src/frontends/qt2/QAbout.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QAbout.C,v
retrieving revision 1.34
diff -u -p -b -r1.34 QAbout.C
--- src/frontends/qt2/QAbout.C 20 May 2004 09:36:27 -0000 1.34
+++ src/frontends/qt2/QAbout.C 23 Jul 2004 23:35:51 -0000
@@ -19,7 +19,8 @@
#include "controllers/ControlAboutlyx.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
#include <qlabel.h>
#include <qpushbutton.h>
Index: src/frontends/qt2/QLog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLog.C,v
retrieving revision 1.25
diff -u -p -b -r1.25 QLog.C
--- src/frontends/qt2/QLog.C 20 May 2004 09:36:27 -0000 1.25
+++ src/frontends/qt2/QLog.C 23 Jul 2004 23:35:52 -0000
@@ -16,7 +16,7 @@
#include "controllers/ControlLog.h"
-#include "support/std_sstream.h"
+#include <sstream>
#include <qtextview.h>
#include <qpushbutton.h>
Index: src/frontends/qt2/QMathMatrixDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QMathMatrixDialog.C,v
retrieving revision 1.20
diff -u -p -b -r1.20 QMathMatrixDialog.C
--- src/frontends/qt2/QMathMatrixDialog.C 2 Jun 2004 20:13:18 -0000 1.20
+++ src/frontends/qt2/QMathMatrixDialog.C 23 Jul 2004 23:35:52 -0000
@@ -18,7 +18,7 @@
#include "controllers/ControlMath.h"
-#include "support/std_sstream.h"
+#include <sstream>
#include <qcombobox.h>
#include <qlineedit.h>
Index: src/frontends/qt2/QPrefs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefs.C,v
retrieving revision 1.58
diff -u -p -b -r1.58 QPrefs.C
--- src/frontends/qt2/QPrefs.C 20 May 2004 09:36:28 -0000 1.58
+++ src/frontends/qt2/QPrefs.C 23 Jul 2004 23:35:52 -0000
@@ -37,7 +37,6 @@
#include "support/lstrings.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
#include "controllers/ControlPrefs.h"
#include "controllers/frnt_lang.h"
@@ -56,6 +55,7 @@
#include <boost/tuple/tuple.hpp>
#include <iomanip>
+#include <sstream>
using lyx::support::compare_no_case;
using lyx::support::strToDbl;
Index: src/frontends/xforms/Color.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/Color.C,v
retrieving revision 1.36
diff -u -p -b -r1.36 Color.C
--- src/frontends/xforms/Color.C 19 May 2004 15:11:35 -0000 1.36
+++ src/frontends/xforms/Color.C 23 Jul 2004 23:35:52 -0000
@@ -16,9 +16,8 @@
#include "LColor.h"
-#include "support/std_sstream.h"
-
#include <cmath>
+#include <sstream>
#include <iomanip>
#ifndef CXX_GLOBAL_CSTD
Index: src/frontends/xforms/FormAboutlyx.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormAboutlyx.C,v
retrieving revision 1.29
diff -u -p -b -r1.29 FormAboutlyx.C
--- src/frontends/xforms/FormAboutlyx.C 19 May 2004 15:11:35 -0000 1.29
+++ src/frontends/xforms/FormAboutlyx.C 23 Jul 2004 23:35:52 -0000
@@ -18,10 +18,11 @@
#include "ControlAboutlyx.h"
#include "forms/form_aboutlyx.h"
#include "xforms_helpers.h"
-#include "support/std_sstream.h"
#include "version.h"
#include "lyx_forms.h"
+
+#include <sstream>
using std::ostringstream;
Index: src/frontends/xforms/FormLog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormLog.C,v
retrieving revision 1.25
diff -u -p -b -r1.25 FormLog.C
--- src/frontends/xforms/FormLog.C 19 May 2004 15:11:35 -0000 1.25
+++ src/frontends/xforms/FormLog.C 23 Jul 2004 23:35:52 -0000
@@ -14,9 +14,9 @@
#include "ControlLog.h"
#include "forms/form_browser.h"
-#include "support/std_sstream.h"
-
#include "lyx_forms.h"
+
+#include <sstream>
namespace lyx {
namespace frontend {
Index: src/frontends/xforms/FormMathsDelim.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsDelim.C,v
retrieving revision 1.47
diff -u -p -b -r1.47 FormMathsDelim.C
--- src/frontends/xforms/FormMathsDelim.C 19 May 2004 15:11:35 -0000 1.47
+++ src/frontends/xforms/FormMathsDelim.C 23 Jul 2004 23:35:52 -0000
@@ -22,7 +22,7 @@
#include "controllers/ButtonController.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::ostringstream;
Index: src/frontends/xforms/FormMathsMatrix.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsMatrix.C,v
retrieving revision 1.54
diff -u -p -b -r1.54 FormMathsMatrix.C
--- src/frontends/xforms/FormMathsMatrix.C 19 May 2004 15:11:35 -0000 1.54
+++ src/frontends/xforms/FormMathsMatrix.C 23 Jul 2004 23:35:52 -0000
@@ -25,7 +25,7 @@
#include "lyx_forms.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::ostringstream;
Index: src/frontends/xforms/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/lyx_gui.C,v
retrieving revision 1.61
diff -u -p -b -r1.61 lyx_gui.C
--- src/frontends/xforms/lyx_gui.C 22 Jul 2004 13:44:40 -0000 1.61
+++ src/frontends/xforms/lyx_gui.C 23 Jul 2004 23:35:52 -0000
@@ -42,9 +42,10 @@
#include <boost/bind.hpp>
-#include "support/std_sstream.h"
-#include <iomanip>
#include <fcntl.h>
+
+#include <sstream>
+#include <iomanip>
using lyx::support::AddName;
using lyx::support::user_lyxdir;
Index: src/graphics/GraphicsConverter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsConverter.C,v
retrieving revision 1.42
diff -u -p -b -r1.42 GraphicsConverter.C
--- src/graphics/GraphicsConverter.C 22 Oct 2003 20:39:30 -0000 1.42
+++ src/graphics/GraphicsConverter.C 23 Jul 2004 23:35:52 -0000
@@ -24,7 +24,7 @@
#include <boost/bind.hpp>
-#include "support/std_sstream.h"
+#include <sstream>
#include <fstream>
namespace support = lyx::support;
Index: src/graphics/GraphicsParams.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsParams.C,v
retrieving revision 1.37
diff -u -p -b -r1.37 GraphicsParams.C
--- src/graphics/GraphicsParams.C 6 Oct 2003 15:42:59 -0000 1.37
+++ src/graphics/GraphicsParams.C 23 Jul 2004 23:35:52 -0000
@@ -14,7 +14,7 @@
#include "lyxlength.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::string;
Index: src/graphics/PreviewLoader.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/PreviewLoader.C,v
retrieving revision 1.77
diff -u -p -b -r1.77 PreviewLoader.C
--- src/graphics/PreviewLoader.C 16 Apr 2004 14:34:41 -0000 1.77
+++ src/graphics/PreviewLoader.C 23 Jul 2004 23:35:52 -0000
@@ -37,7 +37,7 @@
#include <boost/bind.hpp>
-#include "support/std_sstream.h"
+#include <sstream>
#include <fstream>
#include <iomanip>
Index: src/insets/ExternalTransforms.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ExternalTransforms.C,v
retrieving revision 1.5
diff -u -p -b -r1.5 ExternalTransforms.C
--- src/insets/ExternalTransforms.C 3 Apr 2004 08:37:10 -0000 1.5
+++ src/insets/ExternalTransforms.C 23 Jul 2004 23:35:52 -0000
@@ -19,8 +19,9 @@
#include "support/translator.h"
#include <boost/regex.hpp>
-#include "support/std_sstream.h"
+
#include <cmath> // std::abs
+#include <sstream>
using lyx::support::float_equal;
Index: src/insets/insetbox.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbox.C,v
retrieving revision 1.21
diff -u -p -b -r1.21 insetbox.C
--- src/insets/insetbox.C 3 Apr 2004 08:37:10 -0000 1.21
+++ src/insets/insetbox.C 23 Jul 2004 23:35:52 -0000
@@ -25,8 +25,9 @@
#include "metricsinfo.h"
#include "paragraph.h"
-#include "support/std_sstream.h"
#include "support/translator.h"
+
+#include <sstream>
using std::auto_ptr;
using std::string;
Index: src/insets/insetbranch.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbranch.C,v
retrieving revision 1.47
diff -u -p -b -r1.47 insetbranch.C
--- src/insets/insetbranch.C 8 Apr 2004 15:03:30 -0000 1.47
+++ src/insets/insetbranch.C 23 Jul 2004 23:35:52 -0000
@@ -23,7 +23,7 @@
#include "lyxlex.h"
#include "paragraph.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::string;
using std::auto_ptr;
Index: src/insets/insetcaption.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcaption.C,v
retrieving revision 1.55
diff -u -p -b -r1.55 insetcaption.C
--- src/insets/insetcaption.C 5 Apr 2004 09:36:26 -0000 1.55
+++ src/insets/insetcaption.C 23 Jul 2004 23:35:52 -0000
@@ -29,7 +29,7 @@
#include "support/lstrings.h"
-#include "support/std_sstream.h"
+#include <sstream>
using lyx::support::bformat;
Index: src/insets/insetcharstyle.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcharstyle.C,v
retrieving revision 1.18
diff -u -p -b -r1.18 insetcharstyle.C
--- src/insets/insetcharstyle.C 3 Apr 2004 08:37:10 -0000 1.18
+++ src/insets/insetcharstyle.C 23 Jul 2004 23:35:52 -0000
@@ -27,7 +27,8 @@
#include "frontends/font_metrics.h"
#include "frontends/Painter.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using std::string;
Index: src/insets/insetcommand.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcommand.C,v
retrieving revision 1.113
diff -u -p -b -r1.113 insetcommand.C
--- src/insets/insetcommand.C 17 May 2004 08:52:21 -0000 1.113
+++ src/insets/insetcommand.C 23 Jul 2004 23:35:53 -0000
@@ -19,7 +19,7 @@
#include "lyxlex.h"
#include "metricsinfo.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::string;
Index: src/insets/insetert.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetert.C,v
retrieving revision 1.194
diff -u -p -b -r1.194 insetert.C
--- src/insets/insetert.C 1 Apr 2004 10:21:29 -0000 1.194
+++ src/insets/insetert.C 23 Jul 2004 23:35:53 -0000
@@ -29,7 +29,7 @@
#include "frontends/Alert.h"
#include "frontends/LyXView.h"
-#include "support/std_sstream.h"
+#include <sstream>
using lyx::pos_type;
Index: src/insets/insetexternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetexternal.C,v
retrieving revision 1.150
diff -u -p -b -r1.150 insetexternal.C
--- src/insets/insetexternal.C 1 Jun 2004 13:39:33 -0000 1.150
+++ src/insets/insetexternal.C 23 Jul 2004 23:35:53 -0000
@@ -43,10 +43,10 @@
#include "support/lyxlib.h"
#include "support/tostr.h"
#include "support/translator.h"
-#include "support/std_sstream.h"
#include <boost/bind.hpp>
+#include <sstream>
namespace support = lyx::support;
namespace external = lyx::external;
Index: src/insets/insetfloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfloat.C,v
retrieving revision 1.129
diff -u -p -b -r1.129 insetfloat.C
--- src/insets/insetfloat.C 8 Apr 2004 15:03:30 -0000 1.129
+++ src/insets/insetfloat.C 23 Jul 2004 23:35:53 -0000
@@ -32,7 +32,8 @@
#include "support/lstrings.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::support::contains;
Index: src/insets/insetgraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.252
diff -u -p -b -r1.252 insetgraphics.C
--- src/insets/insetgraphics.C 22 Jun 2004 15:26:55 -0000 1.252
+++ src/insets/insetgraphics.C 23 Jul 2004 23:35:53 -0000
@@ -77,12 +77,14 @@ TODO
#include "support/os.h"
#include "support/systemcall.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
#include <boost/bind.hpp>
#include <boost/tuple/tuple.hpp>
+#include <sstream>
+
namespace support = lyx::support;
+
using lyx::support::AbsolutePath;
using lyx::support::bformat;
using lyx::support::ChangeExtension;
Index: src/insets/insetinclude.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetinclude.C,v
retrieving revision 1.193
diff -u -p -b -r1.193 insetinclude.C
--- src/insets/insetinclude.C 1 Jun 2004 13:39:33 -0000 1.193
+++ src/insets/insetinclude.C 23 Jul 2004 23:35:53 -0000
@@ -49,7 +49,8 @@
#include <boost/bind.hpp>
#include "support/std_ostream.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::support::AddName;
using lyx::support::AbsolutePath;
Index: src/insets/insetnote.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetnote.C,v
retrieving revision 1.75
diff -u -p -b -r1.75 insetnote.C
--- src/insets/insetnote.C 25 Mar 2004 09:16:28 -0000 1.75
+++ src/insets/insetnote.C 23 Jul 2004 23:35:53 -0000
@@ -27,9 +27,9 @@
#include "paragraph.h"
#include "support/lyxalgo.h"
-#include "support/std_sstream.h"
#include "support/translator.h"
+#include <sstream>
using std::string;
using std::auto_ptr;
Index: src/insets/insettabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.C,v
retrieving revision 1.421
diff -u -p -b -r1.421 insettabular.C
--- src/insets/insettabular.C 18 Jun 2004 06:47:18 -0000 1.421
+++ src/insets/insettabular.C 23 Jul 2004 23:35:53 -0000
@@ -37,8 +37,7 @@
#include "frontends/LyXView.h"
#include "frontends/Painter.h"
-#include "support/std_sstream.h"
-
+#include <sstream>
#include <iostream>
using lyx::graphics::PreviewLoader;
Index: src/insets/insetvspace.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetvspace.C,v
retrieving revision 1.12
diff -u -p -b -r1.12 insetvspace.C
--- src/insets/insetvspace.C 18 Mar 2004 12:53:41 -0000 1.12
+++ src/insets/insetvspace.C 23 Jul 2004 23:35:53 -0000
@@ -27,7 +27,7 @@
#include "frontends/font_metrics.h"
#include "frontends/Painter.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::istringstream;
using std::ostream;
Index: src/insets/insetwrap.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetwrap.C,v
retrieving revision 1.66
diff -u -p -b -r1.66 insetwrap.C
--- src/insets/insetwrap.C 3 Apr 2004 08:37:11 -0000 1.66
+++ src/insets/insetwrap.C 23 Jul 2004 23:35:53 -0000
@@ -28,9 +28,9 @@
#include "outputparams.h"
#include "paragraph.h"
-#include "support/std_sstream.h"
#include "support/tostr.h"
+#include <sstream>
using std::string;
using std::endl;
Index: src/mathed/command_inset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/command_inset.C,v
retrieving revision 1.27
diff -u -p -b -r1.27 command_inset.C
--- src/mathed/command_inset.C 18 Apr 2004 19:57:58 -0000 1.27
+++ src/mathed/command_inset.C 23 Jul 2004 23:35:53 -0000
@@ -16,7 +16,7 @@
#include "dispatchresult.h"
#include "funcrequest.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::string;
using std::auto_ptr;
Index: src/mathed/formulamacro.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/formulamacro.C,v
retrieving revision 1.155
diff -u -p -b -r1.155 formulamacro.C
--- src/mathed/formulamacro.C 7 Apr 2004 20:20:15 -0000 1.155
+++ src/mathed/formulamacro.C 23 Jul 2004 23:35:53 -0000
@@ -28,7 +28,8 @@
#include "frontends/font_metrics.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::support::bformat;
Index: src/mathed/math_arrayinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_arrayinset.C,v
retrieving revision 1.53
diff -u -p -b -r1.53 math_arrayinset.C
--- src/mathed/math_arrayinset.C 7 Apr 2004 16:54:15 -0000 1.53
+++ src/mathed/math_arrayinset.C 23 Jul 2004 23:35:53 -0000
@@ -15,9 +15,9 @@
#include "math_parser.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
-#include "support/std_sstream.h"
#include <iterator>
+#include <sstream>
using std::getline;
Index: src/mathed/math_autocorrect.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_autocorrect.C,v
retrieving revision 1.18
diff -u -p -b -r1.18 math_autocorrect.C
--- src/mathed/math_autocorrect.C 7 Jan 2004 18:28:50 -0000 1.18
+++ src/mathed/math_autocorrect.C 23 Jul 2004 23:35:54 -0000
@@ -17,10 +17,10 @@
#include "math_parser.h"
#include "debug.h"
-#include "support/std_sstream.h"
#include "support/filetools.h" // LibFileSearch
#include <fstream>
+#include <sstream>
using lyx::support::LibFileSearch;
Index: src/mathed/math_extern.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_extern.C,v
retrieving revision 1.66
diff -u -p -b -r1.66 math_extern.C
--- src/mathed/math_extern.C 30 Jan 2004 11:41:10 -0000 1.66
+++ src/mathed/math_extern.C 23 Jul 2004 23:35:54 -0000
@@ -31,12 +31,12 @@
#include "math_stringinset.h"
#include "math_symbolinset.h"
#include "math_parser.h"
-#include "support/std_sstream.h"
#include "debug.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include <algorithm>
+#include <sstream>
using lyx::support::cmd_ret;
using lyx::support::getVectorFromString;
Index: src/mathed/math_factory.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_factory.C,v
retrieving revision 1.97
diff -u -p -b -r1.97 math_factory.C
--- src/mathed/math_factory.C 13 Apr 2004 13:54:58 -0000 1.97
+++ src/mathed/math_factory.C 23 Jul 2004 23:35:54 -0000
@@ -57,13 +57,13 @@
#include "debug.h"
#include "math_support.h"
-#include "support/std_sstream.h"
#include "support/filetools.h" // LibFileSearch
#include "support/lstrings.h"
#include "frontends/lyx_gui.h"
#include <fstream>
+#include <sstream>
using lyx::support::LibFileSearch;
using lyx::support::split;
Index: src/mathed/math_gridinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_gridinset.C,v
retrieving revision 1.151
diff -u -p -b -r1.151 math_gridinset.C
--- src/mathed/math_gridinset.C 20 Apr 2004 08:51:15 -0000 1.151
+++ src/mathed/math_gridinset.C 23 Jul 2004 23:35:54 -0000
@@ -26,9 +26,9 @@
#include "frontends/Painter.h"
-#include "support/std_sstream.h"
-
#include "insets/mailinset.h"
+
+#include <sstream>
using std::endl;
using std::max;
Index: src/mathed/math_hullinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_hullinset.C,v
retrieving revision 1.140
diff -u -p -b -r1.140 math_hullinset.C
--- src/mathed/math_hullinset.C 17 May 2004 16:29:24 -0000 1.140
+++ src/mathed/math_hullinset.C 23 Jul 2004 23:35:54 -0000
@@ -40,9 +40,9 @@
#include "graphics/PreviewImage.h"
#include "graphics/PreviewLoader.h"
-#include "support/std_sstream.h"
-
#include <boost/bind.hpp>
+
+#include <sstream>
using lyx::cap::grabAndEraseSelection;
Index: src/mathed/math_macrotable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_macrotable.C,v
retrieving revision 1.73
diff -u -p -b -r1.73 math_macrotable.C
--- src/mathed/math_macrotable.C 23 Jul 2004 22:31:14 -0000 1.73
+++ src/mathed/math_macrotable.C 23 Jul 2004 23:35:54 -0000
@@ -19,9 +19,9 @@
#include "debug.h"
#include "dociterator.h"
-#include "support/std_sstream.h"
-
#include <boost/assert.hpp>
+
+#include <sstream>
using std::endl;
using std::istringstream;
Index: src/mathed/math_nestinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_nestinset.C,v
retrieving revision 1.121
diff -u -p -b -r1.121 math_nestinset.C
--- src/mathed/math_nestinset.C 29 Apr 2004 14:49:02 -0000 1.121
+++ src/mathed/math_nestinset.C 23 Jul 2004 23:35:54 -0000
@@ -41,12 +41,13 @@
#include "outputparams.h"
#include "undo.h"
-#include "support/std_sstream.h"
#include "support/lstrings.h"
#include "frontends/Dialogs.h"
#include "frontends/LyXView.h"
#include "frontends/Painter.h"
+
+#include <sstream>
using lyx::cap::copySelection;
using lyx::cap::grabAndEraseSelection;
Index: src/mathed/math_parser.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_parser.C,v
retrieving revision 1.298
diff -u -p -b -r1.298 math_parser.C
--- src/mathed/math_parser.C 13 Apr 2004 13:54:58 -0000 1.298
+++ src/mathed/math_parser.C 23 Jul 2004 23:35:54 -0000
@@ -62,9 +62,10 @@ following hack as starting point to writ
#include "ref_inset.h"
#include "lyxlex.h"
-#include "support/std_sstream.h"
#include "debug.h"
+#include <sstream>
+
#ifndef CXX_GLOBAL_CSTD
using std::atoi;
#endif
@@ -1282,6 +1283,3 @@ void initParser()
theCatcode[int('~')] = catActive;
theCatcode[int('%')] = catComment;
}
-
-
-
Index: src/mathed/math_support.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_support.C,v
retrieving revision 1.91
diff -u -p -b -r1.91 math_support.C
--- src/mathed/math_support.C 8 Apr 2004 15:24:22 -0000 1.91
+++ src/mathed/math_support.C 23 Jul 2004 23:35:54 -0000
@@ -24,9 +24,8 @@
#include "frontends/font_metrics.h"
#include "frontends/lyx_gui.h"
-#include "support/std_sstream.h"
-
#include <map>
+#include <sstream>
using std::string;
Index: src/support/filetools.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/filetools.C,v
retrieving revision 1.185
diff -u -p -b -r1.185 filetools.C
--- src/support/filetools.C 29 Jun 2004 12:55:09 -0000 1.185
+++ src/support/filetools.C 23 Jul 2004 23:35:55 -0000
@@ -35,19 +35,19 @@
#include "lyxlib.h"
#include "os.h"
-#include "support/std_sstream.h"
-
#include <boost/assert.hpp>
#include <boost/regex.hpp>
+#include <fcntl.h>
+
#include <cctype>
#include <cstdlib>
#include <cstdio>
-#include <fcntl.h>
#include <cerrno>
#include <utility>
#include <fstream>
+#include <sstream>
// Which part of this is still necessary? (JMarc).
Index: src/support/globbing.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/globbing.C,v
retrieving revision 1.4
diff -u -p -b -r1.4 globbing.C
--- src/support/globbing.C 28 Jan 2004 16:21:29 -0000 1.4
+++ src/support/globbing.C 23 Jul 2004 23:35:55 -0000
@@ -16,12 +16,13 @@
#include "lstrings.h"
#include "path.h"
-#include "std_sstream.h"
#include <boost/regex.hpp>
#include <boost/tokenizer.hpp>
-#include "glob.h"
+#include <glob.h>
+
+#include <sstream>
using std::distance;
using std::ostringstream;
Index: src/support/lstrings.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/lstrings.C,v
retrieving revision 1.85
diff -u -p -b -r1.85 lstrings.C
--- src/support/lstrings.C 1 Feb 2004 12:46:13 -0000 1.85
+++ src/support/lstrings.C 23 Jul 2004 23:35:55 -0000
@@ -12,7 +12,6 @@
#include <config.h>
#include "lstrings.h"
-#include "support/std_sstream.h"
#include "debug.h"
#include "lyxlib.h"
#include "tostr.h"
@@ -25,6 +24,8 @@
#include <cctype>
#include <cstdlib>
+
+#include <sstream>
using std::transform;
using std::string;
Index: src/support/tostr.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/tostr.C,v
retrieving revision 1.11
diff -u -p -b -r1.11 tostr.C
--- src/support/tostr.C 7 Jan 2004 16:40:30 -0000 1.11
+++ src/support/tostr.C 23 Jul 2004 23:35:55 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-#include "support/std_sstream.h"
+#include <sstream>
using std::string;
using std::ostringstream;
--
Lgb
