X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fboost.C;h=ff420ec555311da2a44d247c96dd3096e4951ec3;hb=b817032684f9ac8c639c013ddcc266ee5d8eed45;hp=e4d3cf44ed293fc301943ff19854195cf39ccef4;hpb=fcdb71906b6f41dd5719608b1e57286037fc5f2c;p=lyx.git

diff --git a/src/boost.C b/src/boost.C
index e4d3cf44ed..ff420ec555 100644
--- a/src/boost.C
+++ b/src/boost.C
@@ -12,47 +12,48 @@
 
 #include "lyx_main.h"
 #include "debug.h"
+#include "support/lyxlib.h"
 
 #include <boost/assert.hpp>
 
 #include <exception>
 
 using std::endl;
+using lyx::lyxerr;
+using lyx::LyX;
 
 namespace boost {
 
+#ifndef BOOST_NO_EXCEPTIONS
 void throw_exception(std::exception const & e)
 {
 	lyxerr << "Exception caught:\n"
 	    << e.what() << endl;
 	BOOST_ASSERT(false);
 }
+#endif
 
 
-namespace {
-
 void emergencyCleanup()
 {
-        static bool didCleanup;
-        if (didCleanup)
-                return;
-
-        didCleanup = true;
+	static bool didCleanup;
+	if (didCleanup)
+		return;
 
-        LyX::emergencyCleanup();
-}
+	didCleanup = true;
 
+	LyX::cref().emergencyCleanup();
 }
 
 
 void assertion_failed(char const * expr, char const * function,
 		      char const * file, long line)
 {
-	lyxerr << "Assertion triggered in " << function << " by \"" <<
-		expr << " in file " << file << ":" << line << endl;
+	lyxerr << "Assertion triggered in " << function
+	       << " by failing check \"" << expr << "\""
+	       << " in file " << file << ":" << line << endl;
 	emergencyCleanup();
-	assert(false);
+	lyx::support::abort();
 }
 
-
-}
+} // namespace boost