* lyx_main.C: remove duplicate function assertion_failed

	* boost.C: fix namespace problem regarding assertion_failed

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15844 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/boost.C b/src/boost.C
index b335e31c711f8b5d3e6e690718d2da3d6429f4ce..ff420ec555311da2a44d247c96dd3096e4951ec3 100644 (file)
--- a/src/boost.C
+++ b/src/boost.C
@@ -18,10 +18,9 @@
 
 #include <exception>
 
-
-namespace lyx {
-
 using std::endl;
+using lyx::lyxerr;
+using lyx::LyX;
 
 namespace boost {
 
@@ -34,7 +33,6 @@ void throw_exception(std::exception const & e)
 }
 #endif
 
-namespace {
 
 void emergencyCleanup()
 {
@@ -47,8 +45,6 @@ void emergencyCleanup()
        LyX::cref().emergencyCleanup();
 }
 
-}
-
 
 void assertion_failed(char const * expr, char const * function,
                      char const * file, long line)
@@ -57,11 +53,7 @@ void assertion_failed(char const * expr, char const * function,
               << " by failing check \"" << expr << "\""
               << " in file " << file << ":" << line << endl;
        emergencyCleanup();
-       support::abort();
+       lyx::support::abort();
 }
 
-
-}
-
-
-} // namespace lyx
+} // namespace boost

diff --git a/src/lyx_main.C b/src/lyx_main.C
index fce2656ba5e128caf7f9a24e2d49d1c22e451b8f..cc856fb70a4e3a8aaca7f0a644e1d1af14e227e5 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -1306,15 +1306,3 @@ kb_keymap & theTopLevelKeymap()
 }
 
 } // namespace lyx
-
-
-namespace boost {
-
-void assertion_failed(char const* a, char const* b, char const* c, long d)
-{
-       lyx::lyxerr << "Assertion failed: " << a << ' ' << b << ' ' << c << ' '
-               << d << '\n';
-}
-
-} // boost
-