Remove 3rdparty/boost/Makefile.am

[lyx.git] / src / tex2lyx / boost.cpp

diff --git a/src/tex2lyx/boost.cpp b/src/tex2lyx/boost.cpp
index e073058e87a3a9a4a503667283c6e2282008bcac..41fef07b5a9a47b77af3af41194c42649e1ba216 100644 (file)
--- a/src/tex2lyx/boost.cpp
+++ b/src/tex2lyx/boost.cpp
@@ -3,40 +3,49 @@
  * 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 "support/debug.h"
-
 #include <boost/assert.hpp>
 
 #include <cstdlib>
 #include <exception>
-#include <ostream>
-
+#include <iostream>
 
-using std::endl;
+using namespace std;
 
 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;
+       cerr << "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
+       cerr << "Assertion triggered in " << function
+           << " by failing check \"" << expr << "\""
+           << " in file " << file << ":" << line << endl;
+       ::abort();
+}
+
+void assertion_failed_msg(char const * expr, char const * msg,
+               char const * function, char const * file, long line)
+{
+       cerr << "Assertion triggered in " << function
               << " by failing check \"" << expr << "\""
+              << " with message \"" << msg << "\""
               << " in file " << file << ":" << line << endl;
+
        ::abort();
 }