1.1 --- a/lemon/assert.h Sun Jul 13 20:09:47 2008 +0100
1.2 +++ b/lemon/assert.h Mon Jul 14 09:15:23 2008 +0200
1.3 @@ -66,17 +66,17 @@
1.4 #undef LEMON_FIXME
1.5 #undef LEMON_DEBUG
1.6
1.7 -#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
1.8 - (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
1.9 +#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
1.10 + (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
1.11 (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) > 1
1.12 #error "LEMON assertion system is not set properly"
1.13 #endif
1.14
1.15 -#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
1.16 - (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
1.17 - (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 || \
1.18 - defined(LEMON_ENABLE_ASSERTS)) && \
1.19 - (defined(LEMON_DISABLE_ASSERTS) || \
1.20 +#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
1.21 + (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
1.22 + (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 || \
1.23 + defined(LEMON_ENABLE_ASSERTS)) && \
1.24 + (defined(LEMON_DISABLE_ASSERTS) || \
1.25 defined(NDEBUG))
1.26 #error "LEMON assertion system is not set properly"
1.27 #endif
1.28 @@ -168,9 +168,9 @@
1.29 /// \ref lemon/assert.h "assert.h" file is reincluded, then the
1.30 /// behaviour is changed appropiately to the new settings.
1.31 # define LEMON_ASSERT(exp, msg) \
1.32 - (static_cast<void> (!!(exp) ? 0 : ( \
1.33 - LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
1.34 - LEMON_FUNCTION_NAME, \
1.35 + (static_cast<void> (!!(exp) ? 0 : ( \
1.36 + LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
1.37 + LEMON_FUNCTION_NAME, \
1.38 ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
1.39
1.40 /// \ingroup exceptions
1.41 @@ -184,9 +184,9 @@
1.42 /// \endcode
1.43 ///
1.44 /// \see LEMON_ASSERT
1.45 -# define LEMON_FIXME(msg) \
1.46 +# define LEMON_FIXME(msg) \
1.47 (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
1.48 - ::lemon::_assert_bits::cstringify(msg), \
1.49 + ::lemon::_assert_bits::cstringify(msg), \
1.50 static_cast<const char*>(0)))
1.51
1.52 /// \ingroup exceptions
1.53 @@ -212,10 +212,10 @@
1.54 /// macro.
1.55 ///
1.56 /// \see LEMON_ASSERT
1.57 -# define LEMON_DEBUG(exp, msg) \
1.58 - (static_cast<void> (!!(exp) ? 0 : ( \
1.59 +# define LEMON_DEBUG(exp, msg) \
1.60 + (static_cast<void> (!!(exp) ? 0 : ( \
1.61 LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
1.62 - LEMON_FUNCTION_NAME, \
1.63 + LEMON_FUNCTION_NAME, \
1.64 ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
1.65
1.66 #else
1.67 @@ -225,23 +225,23 @@
1.68 # define LEMON_FIXME(msg) (static_cast<void>(0))
1.69 # define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
1.70 # else
1.71 -# define LEMON_ASSERT(exp, msg) \
1.72 - (static_cast<void> (!!(exp) ? 0 : ( \
1.73 +# define LEMON_ASSERT(exp, msg) \
1.74 + (static_cast<void> (!!(exp) ? 0 : ( \
1.75 LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
1.76 - LEMON_FUNCTION_NAME, \
1.77 - ::lemon::_assert_bits::cstringify(msg), \
1.78 + LEMON_FUNCTION_NAME, \
1.79 + ::lemon::_assert_bits::cstringify(msg), \
1.80 #exp), 0)))
1.81 -# define LEMON_FIXME(msg) \
1.82 - (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
1.83 - ::lemon::_assert_bits::cstringify(msg), \
1.84 +# define LEMON_FIXME(msg) \
1.85 + (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
1.86 + ::lemon::_assert_bits::cstringify(msg), \
1.87 static_cast<const char*>(0)))
1.88
1.89 # if LEMON_ENABLE_DEBUG
1.90 # define LEMON_DEBUG(exp, msg)
1.91 - (static_cast<void> (!!(exp) ? 0 : ( \
1.92 - LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
1.93 - LEMON_FUNCTION_NAME, \
1.94 - ::lemon::_assert_bits::cstringify(msg), \
1.95 + (static_cast<void> (!!(exp) ? 0 : ( \
1.96 + LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
1.97 + LEMON_FUNCTION_NAME, \
1.98 + ::lemon::_assert_bits::cstringify(msg), \
1.99 #exp), 0)))
1.100 # else
1.101 # define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
1.102 @@ -249,13 +249,3 @@
1.103 # endif
1.104
1.105 #endif
1.106 -
1.107 -#ifdef DOXYGEN
1.108 -
1.109 -
1.110 -#else
1.111 -
1.112 -
1.113 -#endif
1.114 -
1.115 -