X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fboost.cpp;h=646d4e4dfb3960c48e6ad6bf1be816fbba611a2d;hb=0f9ef6877c8e590ae4b04bf009f8c50eb9a8e103;hp=60da461b5dd6c5d52806c81f69b7ce3fa0e63fad;hpb=7f461f4392a19cf488dec005d2f12cfea83655d9;p=lyx.git

diff --git a/src/boost.cpp b/src/boost.cpp
index 60da461b5d..646d4e4dfb 100644
--- a/src/boost.cpp
+++ b/src/boost.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,15 +14,14 @@
 
 #include "support/debug.h"
 
-#include "support/assert.h"
+#include "support/lassert.h"
 
 #include <exception>
 #include <iomanip>
-#include <iostream>
+#include <ostream>
 
 using namespace std;
 using lyx::lyxerr;
-using lyx::LyX;
 
 namespace boost {
 
@@ -36,7 +35,7 @@ void throw_exception(exception const & e)
 
 
 void assertion_failed(char const * expr, char const * function,
-		      char const * file, long line)
+		char const * file, long line)
 {
 	lyxerr << "Assertion triggered in " << function
 	       << " by failing check \"" << expr << "\""
@@ -45,7 +44,21 @@ void assertion_failed(char const * expr, char const * function,
 	// FIXME: by default we exit here but we could also inform the user
 	// about the assertion and do the emergency cleanup without exiting.
 	// FIXME: do we have a list of exit codes defined somewhere?
-	LyX::cref().exit(1);
+	lyx::lyx_exit(1);
+}
+
+void assertion_failed_msg(char const * expr, char const * msg,
+		char const * function, char const * file, long line)
+{
+	lyxerr << "Assertion triggered in " << function
+	       << " by failing check \"" << expr << "\""
+	       << " with message \"" << msg << "\""
+	       << " in file " << file << ":" << line << endl;
+
+	// FIXME: by default we exit here but we could also inform the user
+	// about the assertion and do the emergency cleanup without exiting.
+	// FIXME: do we have a list of exit codes defined somewhere?
+	lyx::lyx_exit(1);
 }
 
 } // namespace boost