anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 14:29:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make strings used in various assertions non-static.

Browse Source
This commit is contained in:
Richard Heck 2013-04-28 13:06:21 -04:00
parent ea6240b785
commit edd127f993
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/support/lassert.cpp
View File

@ -49,8 +49,8 @@ void doAssert(char const * expr, char const * file, long line)
docstring formatHelper(docstring const & msg, docstring formatHelper(docstring const & msg,
char const * expr, char const * file, long line) char const * expr, char const * file, long line)
{ {
static const docstring d = docstring const d = _("Assertion %1$s violated in\nfile: %2$s, line: %3$s");
from_ascii(N_("Assertion %1$s violated in\nfile: %2$s, line: %3$s")); LYXERR0("ASSERTION " << expr << " VIOLATED IN " << file << ":" << line);
return bformat(d, from_ascii(expr), from_ascii(file), return bformat(d, from_ascii(expr), from_ascii(file),
convert<docstring>(line)) + '\n' + msg; convert<docstring>(line)) + '\n' + msg;
@ -59,9 +59,7 @@ docstring formatHelper(docstring const & msg,
void doWarnIf(char const * expr, char const * file, long line) void doWarnIf(char const * expr, char const * file, long line)
{ {
static const docstring d = docstring const d = _("It should be safe to continue, but you\nmay wish to save your work and restart LyX.");
from_ascii(N_("It should be safe to continue, but you may wish to save your work and restart LyX."));
LYXERR0("ASSERTION " << expr << " VIOLATED IN " << file << ":" << line);
// comment this out if not needed // comment this out if not needed
BOOST_ASSERT(false); BOOST_ASSERT(false);
throw ExceptionMessage(WarningException, _("Warning!"), throw ExceptionMessage(WarningException, _("Warning!"),
@ -71,9 +69,7 @@ void doWarnIf(char const * expr, char const * file, long line)
void doBufErr(char const * expr, char const * file, long line) void doBufErr(char const * expr, char const * file, long line)
{ {
static const docstring d = docstring const d = _("There has been an error with this document.\nLyX will attempt to close it safely.");
from_ascii(N_("There has been an error with this document. LyX will attempt to close it safely."));
LYXERR0("ASSERTION " << expr << " VIOLATED IN " << file << ":" << line);
// comment this out if not needed // comment this out if not needed
BOOST_ASSERT(false); BOOST_ASSERT(false);
throw ExceptionMessage(BufferException, _("Buffer Error!"), throw ExceptionMessage(BufferException, _("Buffer Error!"),
@ -83,9 +79,7 @@ void doBufErr(char const * expr, char const * file, long line)
void doAppErr(char const * expr, char const * file, long line) void doAppErr(char const * expr, char const * file, long line)
{ {
static const docstring d = docstring const d = _("LyX has encountered an application error\nand will now shut down.");
from_ascii(N_("LyX has encountered an application error and will now shut down."));
LYXERR0("ASSERTION " << expr << " VIOLATED IN " << file << ":" << line);
// comment this out if not needed // comment this out if not needed
BOOST_ASSERT(false); BOOST_ASSERT(false);
throw ExceptionMessage(ErrorException, _("Fatal Exception!"), throw ExceptionMessage(ErrorException, _("Fatal Exception!"),