fix some namespace issues for gcc 3.4

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7770 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 31d9637b2cc781a04f5c86bbdfe6cddffb9726a4..0846ab4e373e2f08a723ececf7a978a48618de14 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-16  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * main.C: 
+       * lyx_main.C: 
+       * lyx_cb.C: 
+       * buffer.C: 
+       * LaTeX.C: use namespace alias for lyx::support::os
+
 2003-09-16  Angus Leeming  <leeming@lyx.org>
 
        * bufferparams.C:

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 9f82bc8400f7cfff1856618981c37e1964c0f049..e0ad7193314658835043845027d6e923128fdcd8 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -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;
@@ -48,6 +47,8 @@ using lyx::support::suffixIs;
 using lyx::support::Systemcall;
 using lyx::support::unlink;
 
+namespace os = lyx::support::os;
+
 using boost::regex;
 using boost::smatch;
 

diff --git a/src/buffer.C b/src/buffer.C
index d8a6b5bab12a5deee9bc90eda4cc23a79b3a0e38..19d4103fc8c09ddbbe13fe67c09fbd004a1cfbda 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -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;
@@ -107,6 +106,8 @@ using lyx::support::subst;
 using lyx::support::tempName;
 using lyx::support::trim;
 
+namespace os = lyx::support::os;
+
 using std::endl;
 using std::for_each;
 using std::make_pair;

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 6a8b603d77da25775c191469acdf2e79aac4bd20..957601669dde7cc89c2c3c4b567a2e7a0a1992d5 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-16  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * lyx_gui.C: use namespace alias for lyx::support::os
+
 2003-09-16  Angus Leeming  <leeming@lyx.org>
 
        * FormDocument.C: add #include "LColor.h".

diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C
index c5a09dc7d230045c164e2b8b3c6776eae19e7dad..52326b410e6e57a3914423cdde024d1939a9fabc 100644 (file)
--- a/src/frontends/xforms/lyx_gui.C
+++ b/src/frontends/xforms/lyx_gui.C
@@ -44,9 +44,10 @@
 #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;
 #endif

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 49fca4448cac3fb3370327a974e401c0798d1fcf..0798436326526457defbdc0ce0009cd7f70261ec 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-16  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * insetgraphics.C: 
+       * insetbibtex.C: use namespace alias for lyx::support::os
+
 2003-09-16  Angus Leeming  <leeming@lyx.org>
 
        * insetcollapsable.h: remove ununsed framecolor variable.
@@ -29,7 +34,7 @@
 
        * insetcollapsable.h: add #include "LColor.h"
        (for its framecolor member variable).
-       
+
 2003-09-16  Angus Leeming  <leeming@lyx.org>
 
        * insetenv.C (constructor): use accessor functions to access InsetText variables.

diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C
index d880674ea2383e8cd0772e7f4e777b36e0c0e405..d9c86160cb2ffd7e9d7df4a27cb79cb64a247b43 100644 (file)
--- a/src/insets/insetbibtex.C
+++ b/src/insets/insetbibtex.C
@@ -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;
@@ -43,6 +42,8 @@ using lyx::support::subst;
 using lyx::support::tokenPos;
 using lyx::support::trim;
 
+namespace os = lyx::support::os;
+
 using std::endl;
 using std::getline;
 

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 5c303d867d37604b18ebbfc182e7a089cf6e6f78..48756136208fd4229525443df87378f4bd9a052c 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -92,12 +92,13 @@ 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;
 
 using std::auto_ptr;

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 6149734b948a24dd498f59c7680051d51bb7be5c..216f3aca041ac02dca0e2b60064aeb1c53679c87 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -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;
@@ -67,6 +66,8 @@ 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;
 using std::endl;

diff --git a/src/lyx_main.C b/src/lyx_main.C
index f82b70bd7c0f90142c41a376525fe068519fb649..776dec52eea8df3e3e24247fd8810b0dba3e7120 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -64,13 +64,14 @@ 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;
 
 using std::vector;

diff --git a/src/main.C b/src/main.C
index c4d12b50ac8854ea1e2e57da3a9b3cdd30daaf74..3dbd1ea06704cb1b8ba63fd1425119328e3e9b2a 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -19,7 +19,8 @@
 #include <ios>
 #endif
 
-using lyx::support::os;
+
+namespace os = lyx::support::os;
 
 
 int main(int argc, char * argv[])