X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fboost.cpp;h=646d4e4dfb3960c48e6ad6bf1be816fbba611a2d;hb=27ba830b8ef513c8332e15747797844a97807791;hp=874bc06b4b68786e80679ae2b686fb0311ac9916;hpb=f2f7ec1a05c7efc65c04d3a1fba22848a22a2838;p=lyx.git

diff --git a/src/boost.cpp b/src/boost.cpp
index 874bc06b4b..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.
  */
@@ -13,16 +13,15 @@
 #include "LyX.h"
 
 #include "support/debug.h"
-#include "support/lyxlib.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 #include <exception>
 #include <iomanip>
+#include <ostream>
 
 using namespace std;
 using lyx::lyxerr;
-using lyx::LyX;
 
 namespace boost {
 
@@ -30,13 +29,13 @@ namespace boost {
 void throw_exception(exception const & e)
 {
 	lyxerr << "Exception caught:\n" << e.what() << endl;
-	BOOST_ASSERT(false);
+	LASSERT(false, /**/);
 }
 #endif
 
 
 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