Update to boost 1.72

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

diff --git a/src/client/boost.cpp b/src/client/boost.cpp
index bf53dd164c74f1accb1b67085b126b6fdc056bd6..d2cc50db9837c2b99ef46b02a167fae527853e82 100644 (file)
--- a/src/client/boost.cpp
+++ b/src/client/boost.cpp
@@ -10,33 +10,47 @@
 
 #include <config.h>
 
-#include "LyX.h"
 #include "support/debug.h"
 
 #include <boost/assert.hpp>
 
+#include <cstdlib>
 #include <exception>
-#include <ostream>
+#include <iostream>
 
 using namespace std;
+using lyx::lyxerr;
 
 namespace boost {
 
+#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)
+{
+       lyxerr << "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)
 {
-       lyx::lyxerr << "Assertion triggered in " << function
+       lyxerr << "Assertion triggered in " << function
               << " by failing check \"" << expr << "\""
+              << " with message \"" << msg << "\""
               << " in file " << file << ":" << line << endl;
-       lyx::support::abort();
+
+       ::abort();
 }
-*/
 
 } // namespace boost