From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Tue, 1 Jul 2003 21:31:06 +0000 (+0000)
Subject: some more lyx::support fixups.
X-Git-Tag: 1.6.10~16583
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0148aec357b28113df91019c0f93f13fa9a022da;p=features.git

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 b45780154b..cf642607a3 100644
--- 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 e464daf2ac..49d04e3a83 100644
--- 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 328538e711..30131d8b49 100644
--- 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