Update shortcuts in fr.po

[lyx.git] / src / boost.cpp

diff --git a/src/boost.cpp b/src/boost.cpp
index 768f4117f05b3bb8515be12be39f5c0ff942385d..7ae7433a1bea38ca2e537682e457789fba571ef3 100644 (file)
--- 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 <iostream>
 
 using namespace std;
 using lyx::lyxerr;
-using lyx::LyX;
 
 namespace boost {
 
@@ -30,31 +29,22 @@ namespace boost {
 void throw_exception(std::exception const & e)
 {
        lyxerr << "Exception caught:\n" << e.what() << endl;
-       BOOST_ASSERT(false);
+       LASSERT(false, /**/);
 }
 #endif
 
 
-void emergencyCleanup()
-{
-       static bool didCleanup;
-       if (didCleanup)
-               return;
-
-       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 failing check \"" << expr << "\""
               << " in file " << file << ":" << line << endl;
-       emergencyCleanup();
-       lyx::support::abort();
+
+       // 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