some more lyx::support fixups.

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

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index b45780154b3317d934195c1b998f841b415fa401..cf642607a31aa50c7fbd909c545b0d7703648478 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,5 +1,9 @@
 2003-07-01  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
+       * os_win32.C: put namespace os in lyx::support.
+
+       * lstrings.C (bformat): call Assert from correct namespace.
+
        * introduce namespace lyx::support
 
 2003-06-30  André Pönitz  <poenitz@gmx.net>

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index e464daf2ac5598fc6f1c74a5781b1069105c97a3..49d04e3a83bafc200ad7e5558f8317158a87ebb9 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -702,11 +702,11 @@ string bformat(string const & fmt, string const & arg1, string const & arg2,
 string bformat(string const & fmt, string const & arg1, string const & arg2,
        string const & arg3, string const & arg4, string const & arg5)
 {
-       lyx::Assert(contains(fmt, "%1$s"));
-       lyx::Assert(contains(fmt, "%2$s"));
-       lyx::Assert(contains(fmt, "%3$s"));
-       lyx::Assert(contains(fmt, "%4$s"));
-       lyx::Assert(contains(fmt, "%5$s"));
+       Assert(contains(fmt, "%1$s"));
+       Assert(contains(fmt, "%2$s"));
+       Assert(contains(fmt, "%3$s"));
+       Assert(contains(fmt, "%4$s"));
+       Assert(contains(fmt, "%5$s"));
        string str = subst(fmt, "%1$s", arg1);
        str = subst(str, "%2$s", arg2);
        str = subst(str, "%3$s", arg3);

diff --git a/src/support/os_win32.C b/src/support/os_win32.C
index 328538e71165e7528b2db7680c7c28516a097e84..30131d8b498d9ba06430699b78105791f9c0894b 100644 (file)
--- a/src/support/os_win32.C
+++ b/src/support/os_win32.C
@@ -21,6 +21,7 @@
 #include <io.h>
 #include <sys/cygwin.h>
 
+using namespace lyx::support;
 using std::endl;
 
 
@@ -33,6 +34,8 @@ string tmpdir_;
 }
 
 
+namespace lyx {
+namespace support {
 namespace os {
 
 void init(int * /* argc */, char ** argv[])
@@ -190,4 +193,6 @@ shell_type shell()
        return UNIX;
 }
 
-} // end namespace os
+} // namespace os
+} // namespace support
+} // namespace lyx