Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / boost.cpp

diff --git a/src/boost.cpp b/src/boost.cpp
index 46d43df40ecdce4667951b3efe45fbe061889f04..b255e608850bc0d8ae7f7f171a0c65a5db10293e 100644 (file)
--- a/src/boost.cpp
+++ b/src/boost.cpp
@@ -13,21 +13,20 @@
 #include "LyX.h"
 
 #include "support/debug.h"
-#include "support/lyxlib.h"
 
 #include <boost/assert.hpp>
 
 #include <exception>
 #include <iomanip>
 
-using std::endl;
+using namespace std;
 using lyx::lyxerr;
 using lyx::LyX;
 
 namespace boost {
 
 #ifndef BOOST_NO_EXCEPTIONS
-void throw_exception(std::exception const & e)
+void throw_exception(exception const & e)
 {
        lyxerr << "Exception caught:\n" << e.what() << endl;
        BOOST_ASSERT(false);
@@ -35,26 +34,17 @@ void throw_exception(std::exception const & e)
 #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::cref().exit(1);
 }
 
 } // namespace boost