more changes read the ChangeLog

[lyx.git] / src / support / LAssert.h

diff --git a/src/support/LAssert.h b/src/support/LAssert.h
index e429df8c11cf99ad5e82ea59f1d47c6aacfb434d..f44f9ceaa201956f4f704e12669f28e2005b98ed 100644 (file)
--- a/src/support/LAssert.h
+++ b/src/support/LAssert.h
@@ -2,47 +2,32 @@
 #ifndef LASSERT_H
 #define LASSERT_H
 
+#include "support/lyxlib.h"
+
 //namespace LyX {
 
 #ifdef ENABLE_ASSERTIONS
 
-//template<class X, class A> inline void Assert(A assertion)
-template<class A> inline void Assert(A assertion)
-{
-       //if (!assertion) throw X();
-       if (!assertion) {
-               abort();
-       }
-}
+extern void emergencySave();
 
-#ifdef HAVE_PARTIAL_SPECIALIZATION
-// Not too sure if this is the correct way to specialize
-template<class A> inline void Assert(A * ptr)
-{
-       Assert<void const *>(ptr);
-}
-template<> inline void Assert(void const * ptr)
+template<class A>
+inline
+void Assert(A assertion)
 {
-       if (!ptr) {
-               abort();
+       if (!assertion) {
+               ::emergencySave();
+               lyx::abort();
        }
 }
-#endif /* HAVE_PARTIAL_SPECIALIZATION  */ 
-
-//template<class A, class E> inline void Assert(A assertion, E except)
-//{
-//     if (!assertion) except;
-//}
 
 #else
 
-template<class A> inline void Assert(A /*assertion*/) {}
+template<class A>
+inline
+void Assert(A /*assertion*/) {}
 
 #endif /* ENABLE_ASSERTIONS */
 
-
 //} // end of namespace LyX
-
-
 #endif /* LASSERT_H */