This patch is needed to compile with gcc 3.4 (CVS).
Currently gcc 3.4 is not able to compile lyx at all due to ICE's...
but this patch takes care of our errors.
? gcc34.diff
? src/insets/insetfloat.ii.gz
? src/insets/insetfloat.s
Index: src/LaTeX.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LaTeX.C,v
retrieving revision 1.92
diff -u -p -r1.92 LaTeX.C
--- src/LaTeX.C 15 Sep 2003 10:59:51 -0000 1.92
+++ src/LaTeX.C 16 Sep 2003 00:10:30 -0000
@@ -39,7 +39,6 @@ using lyx::support::FileInfo;
using lyx::support::findtexfile;
using lyx::support::getcwd;
using lyx::support::OnlyFilename;
-using lyx::support::os;
using lyx::support::prefixIs;
using lyx::support::QuoteName;
using lyx::support::rtrim;
@@ -47,6 +46,8 @@ using lyx::support::split;
using lyx::support::suffixIs;
using lyx::support::Systemcall;
using lyx::support::unlink;
+
+namespace os = lyx::support::os;
using boost::regex;
using boost::smatch;
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.525
diff -u -p -r1.525 buffer.C
--- src/buffer.C 15 Sep 2003 10:59:52 -0000 1.525
+++ src/buffer.C 16 Sep 2003 00:10:31 -0000
@@ -95,7 +95,6 @@ using lyx::support::MakeDisplayPath;
using lyx::support::MakeLatexName;
using lyx::support::OnlyFilename;
using lyx::support::OnlyPath;
-using lyx::support::os;
using lyx::support::Path;
using lyx::support::QuoteName;
using lyx::support::removeAutosaveFile;
@@ -106,6 +105,8 @@ using lyx::support::strToInt;
using lyx::support::subst;
using lyx::support::tempName;
using lyx::support::trim;
+
+namespace os = lyx::support::os;
using std::endl;
using std::for_each;
Index: src/lyx_cb.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_cb.C,v
retrieving revision 1.225
diff -u -p -r1.225 lyx_cb.C
--- src/lyx_cb.C 9 Sep 2003 22:13:23 -0000 1.225
+++ src/lyx_cb.C 16 Sep 2003 00:10:31 -0000
@@ -56,7 +56,6 @@ using lyx::support::MakeAbsPath;
using lyx::support::MakeDisplayPath;
using lyx::support::OnlyFilename;
using lyx::support::OnlyPath;
-using lyx::support::os;
using lyx::support::Path;
using lyx::support::removeAutosaveFile;
using lyx::support::rename;
@@ -66,6 +65,8 @@ using lyx::support::Systemcall;
using lyx::support::tempName;
using lyx::support::unlink;
using lyx::support::user_lyxdir;
+
+namespace os = lyx::support::os;
using std::back_inserter;
using std::copy;
Index: src/lyx_main.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_main.C,v
retrieving revision 1.174
diff -u -p -r1.174 lyx_main.C
--- src/lyx_main.C 15 Sep 2003 15:20:12 -0000 1.174
+++ src/lyx_main.C 16 Sep 2003 00:10:31 -0000
@@ -64,12 +64,13 @@ using lyx::support::GetEnv;
using lyx::support::GetEnvPath;
using lyx::support::i18nLibFileSearch;
using lyx::support::LibFileSearch;
-using lyx::support::os;
using lyx::support::Path;
using lyx::support::rtrim;
using lyx::support::setLyxPaths;
using lyx::support::system_lyxdir;
using lyx::support::user_lyxdir;
+
+namespace os = lyx::support::os;
using std::endl;
Index: src/main.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/main.C,v
retrieving revision 1.25
diff -u -p -r1.25 main.C
--- src/main.C 9 Sep 2003 22:13:28 -0000 1.25
+++ src/main.C 16 Sep 2003 00:10:31 -0000
@@ -19,7 +19,8 @@
#include <ios>
#endif
-using lyx::support::os;
+
+namespace os = lyx::support::os;
int main(int argc, char * argv[])
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.49
diff -u -p -r1.49 lyx_gui.C
--- src/frontends/xforms/lyx_gui.C 15 Sep 2003 15:20:19 -0000 1.49
+++ src/frontends/xforms/lyx_gui.C 16 Sep 2003 00:10:31 -0000
@@ -43,8 +43,9 @@
#include <fcntl.h>
using lyx::support::AddName;
-using lyx::support::os;
using lyx::support::user_lyxdir;
+
+namespace os = lyx::support::os;
#ifndef CXX_GLOBAL_CSTD
using std::exit;
Index: src/insets/insetbibtex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbibtex.C,v
retrieving revision 1.31
diff -u -p -r1.31 insetbibtex.C
--- src/insets/insetbibtex.C 9 Sep 2003 22:13:41 -0000 1.31
+++ src/insets/insetbibtex.C 16 Sep 2003 00:10:32 -0000
@@ -34,7 +34,6 @@ using lyx::support::findtexfile;
using lyx::support::IsFileReadable;
using lyx::support::ltrim;
using lyx::support::MakeAbsPath;
-using lyx::support::os;
using lyx::support::Path;
using lyx::support::prefixIs;
using lyx::support::rtrim;
@@ -42,6 +41,8 @@ using lyx::support::split;
using lyx::support::subst;
using lyx::support::tokenPos;
using lyx::support::trim;
+
+namespace os = lyx::support::os;
using std::endl;
using std::getline;
Index: src/insets/insetgraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.213
diff -u -p -r1.213 insetgraphics.C
--- src/insets/insetgraphics.C 15 Sep 2003 10:59:56 -0000 1.213
+++ src/insets/insetgraphics.C 16 Sep 2003 00:10:32 -0000
@@ -92,11 +92,12 @@ using lyx::support::GetExtension;
using lyx::support::getExtFromContents;
using lyx::support::IsFileReadable;
using lyx::support::LibFileSearch;
-using lyx::support::os;
using lyx::support::rtrim;
using lyx::support::Systemcall;
using lyx::support::unzipFile;
using lyx::support::unzippedFileName;
+
+namespace os = lyx::support::os;
using std::endl;
--
Lgb
