* 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.
*/
#include <config.h>
-#include "LyX.h"
#include "support/debug.h"
-#include "support/lyxlib.h"
#include <boost/assert.hpp>
+#include <cstdlib>
#include <exception>
-#include <ostream>
+#include <iostream>
-
-using std::endl;
+using namespace std;
+using lyx::lyxerr;
namespace boost {
-void throw_exception(std::exception const & e)
+#ifndef BOOST_NO_EXCEPTIONS
+void throw_exception(exception const & e)
{
- lyx::lyxerr << "Exception caught:\n" << e.what() << endl;
+ lyxerr << "Exception caught:\n" << e.what() << endl;
BOOST_ASSERT(false);
}
+#endif
+
-/*
void assertion_failed(char const * expr, char const * function,
- char const * file, long line)
+ char const * file, long line)
{
- lyx::lyxerr << "Assertion triggered in " << function
+ lyxerr << "Assertion triggered in " << function
<< " by failing check \"" << expr << "\""
<< " in file " << file << ":" << line << endl;
- lyx::support::abort();
+ ::abort();
+}
+
+
+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;
+
+ ::abort();
}
-*/
} // namespace boost