anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Alfredo's compile fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6954 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-05-13 11:18:36 +00:00
parent d31244b5e2
commit b21a69d998
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/support/ChangeLog
View File

@ -1,7 +1,10 @@
2003-05-12 Alfredo Braunstein <abraunst@libero.it>
2003-05-12 André Pönitz <poenitz@gmx.net> * lstrings.[Ch]: compile fix
* lstrings.[Ch]: bformat() as wrappre around boost::format 2003-05-12 André Pönitz <poenitz@gmx.net>
* lstrings.[Ch]: bformat() as wrapper around boost::format
2003-05-06 Lars Gullik Bjønnes <larsbj@gullik.net> 2003-05-06 Lars Gullik Bjønnes <larsbj@gullik.net>

14
src/support/lstrings.C
View File

@ -697,7 +697,7 @@ string bformat(char const * fmt, string const & arg1, string const & arg2,
string bformat(char const * fmt, string const & arg1) string bformat(char const * fmt, string const & arg1)
{ {
Assert(contains(fmt, "%1$s")); lyx::Assert(contains(fmt, "%1$s"));
string const str = subst(fmt, "%1$s", arg1); string const str = subst(fmt, "%1$s", arg1);
return subst(str, "%%", "%"); return subst(str, "%%", "%");
} }
@ -705,8 +705,8 @@ string bformat(char const * fmt, string const & arg1)
string bformat(char const * fmt, string const & arg1, string const & arg2) string bformat(char const * fmt, string const & arg1, string const & arg2)
{ {
Assert(contains(fmt, "%1$s")); lyx::Assert(contains(fmt, "%1$s"));
Assert(contains(fmt, "%2$s")); lyx::Assert(contains(fmt, "%2$s"));
string str = subst(fmt, "%1$s", arg1); string str = subst(fmt, "%1$s", arg1);
str = subst(str, "%2$s", arg2); str = subst(str, "%2$s", arg2);
return subst(str, "%%", "%"); return subst(str, "%%", "%");
@ -716,10 +716,10 @@ string bformat(char const * fmt, string const & arg1, string const & arg2)
string bformat(char const * fmt, string const & arg1, string const & arg2, string bformat(char const * fmt, string const & arg1, string const & arg2,
string const & arg3, string const & arg4) string const & arg3, string const & arg4)
{ {
Assert(contains(fmt, "%1$s")); lyx::Assert(contains(fmt, "%1$s"));
Assert(contains(fmt, "%2$s")); lyx::Assert(contains(fmt, "%2$s"));
Assert(contains(fmt, "%3$s")); lyx::Assert(contains(fmt, "%3$s"));
Assert(contains(fmt, "%4$s")); lyx::Assert(contains(fmt, "%4$s"));
string str = subst(fmt, "%1$s", arg1); string str = subst(fmt, "%1$s", arg1);
str = subst(str, "%2$s", arg2); str = subst(str, "%2$s", arg2);
str = subst(str, "%3$s", arg3); str = subst(str, "%3$s", arg3);