Merge lp:~zorba-coders/zorba/disable_assert-invariant into lp:zorba

[Matthias Brantner]

  disable ASSERT_INVARIANT always (not only if NDEBUG is set). The problem with this
  is that it depends on the CMake version whether NDEBUG is set in RelWithDebInfo.
  This might cause unexpected slow queries with some CMake versions.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Ghislain Fourny (gislenius)]

review: Approve

[Cristian Dumitru (cdumitru)]

Validation queue started for merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/disable_assert-invariant/+merge/182971

View workflow at http://74.93.6.105:8888/job/MP/47/

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/disable_assert-invariant/+merge/182971

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'src/store/naive/json_items.h'
--- src/store/naive/json_items.h	2013-06-05 00:37:35 +0000
+++ src/store/naive/json_items.h	2013-08-29 17:56:31 +0000
@@ -472,7 +472,7 @@
 };
 
 
-#ifndef NDEBUG
+#if 0
 #define ASSERT_INVARIANT() assertInvariant()
 #else
 #define ASSERT_INVARIANT()