[Lemon-commits] Alpar Juttner: Merge >=1.2 branch heads

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/6c8e2d8712d8
changeset: 1285:6c8e2d8712d8
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Sun Aug 11 15:29:28 2013 +0200
description:
	Merge >=1.2 branch heads

diffstat:

 lemon/assert.h |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/lemon/assert.h b/lemon/assert.h
--- a/lemon/assert.h
+++ b/lemon/assert.h
@@ -199,7 +199,7 @@
                              LEMON_FUNCTION_NAME,                       \
                              ::lemon::_assert_bits::cstringify(msg),    \
                              #exp), 0)))
-#    if LEMON_ENABLE_DEBUG
+#    if defined LEMON_ENABLE_DEBUG
 #      define LEMON_DEBUG(exp, msg)                                     \
          (static_cast<void> (!!(exp) ? 0 : (                            \
            LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                     \