Merge >=1.2 branch heads
authorAlpar Juttner <alpar@cs.elte.hu>
Sun, 11 Aug 2013 15:29:28 +0200
changeset 10966c8e2d8712d8
parent 1095 ad40f7d32846
parent 1072 0e30f63d45d0
child 1097 dd5b5d96b657
child 1098 cf6084618b1b
Merge >=1.2 branch heads
     1.1 --- a/lemon/assert.h	Sun Aug 11 15:28:12 2013 +0200
     1.2 +++ b/lemon/assert.h	Sun Aug 11 15:29:28 2013 +0200
     1.3 @@ -199,7 +199,7 @@
     1.4                               LEMON_FUNCTION_NAME,                       \
     1.5                               ::lemon::_assert_bits::cstringify(msg),    \
     1.6                               #exp), 0)))
     1.7 -#    if LEMON_ENABLE_DEBUG
     1.8 +#    if defined LEMON_ENABLE_DEBUG
     1.9  #      define LEMON_DEBUG(exp, msg)                                     \
    1.10           (static_cast<void> (!!(exp) ? 0 : (                            \
    1.11             LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                     \