From b21a69d998c2272a3de9d05e648e45af5c82ce5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Tue, 13 May 2003 11:18:36 +0000 Subject: [PATCH] Alfredo's compile fix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6954 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/support/ChangeLog | 7 +++++-- src/support/lstrings.C | 14 +++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 05ceca3811..ff85dcc4da 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,7 +1,10 @@ +2003-05-12 Alfredo Braunstein -2003-05-12 André Pönitz + * lstrings.[Ch]: compile fix - * lstrings.[Ch]: bformat() as wrappre around boost::format +2003-05-12 André Pönitz + + * lstrings.[Ch]: bformat() as wrapper around boost::format 2003-05-06 Lars Gullik Bjřnnes diff --git a/src/support/lstrings.C b/src/support/lstrings.C index 9321eac157..06853b21d4 100644 --- a/src/support/lstrings.C +++ b/src/support/lstrings.C @@ -697,7 +697,7 @@ string bformat(char const * fmt, string const & arg1, string const & arg2, 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); 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) { - Assert(contains(fmt, "%1$s")); - Assert(contains(fmt, "%2$s")); + lyx::Assert(contains(fmt, "%1$s")); + lyx::Assert(contains(fmt, "%2$s")); string str = subst(fmt, "%1$s", arg1); str = subst(str, "%2$s", arg2); 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 const & arg3, string const & arg4) { - Assert(contains(fmt, "%1$s")); - Assert(contains(fmt, "%2$s")); - Assert(contains(fmt, "%3$s")); - Assert(contains(fmt, "%4$s")); + lyx::Assert(contains(fmt, "%1$s")); + lyx::Assert(contains(fmt, "%2$s")); + lyx::Assert(contains(fmt, "%3$s")); + lyx::Assert(contains(fmt, "%4$s")); string str = subst(fmt, "%1$s", arg1); str = subst(str, "%2$s", arg2); str = subst(str, "%3$s", arg3);