zorba-coders team mailing list archive

[David Graf <david.graf@xxxxxxxxxx>]

David Graf has proposed merging lp:~davidagraf/zorba/windows-build-fix into lp:zorba.

Requested reviews:
  David Graf (davidagraf)
  Dennis Knochenwefel (dennis-knochenwefel)

For more details, see:
https://code.launchpad.net/~davidagraf/zorba/windows-build-fix/+merge/113196

windows build fix
-- 
https://code.launchpad.net/~davidagraf/zorba/windows-build-fix/+merge/113196
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/store/naive/simple_pul.cpp'
--- src/store/naive/simple_pul.cpp	2012-06-28 04:14:03 +0000
+++ src/store/naive/simple_pul.cpp	2012-07-03 10:54:18 +0000
@@ -167,12 +167,14 @@
 {
   const QNameItem* collName;
 
+#ifdef ZORBA_WITH_JSON
   assert(target->isNode()
-#ifdef ZORBA_WITH_JSON
       || target->isJSONObject()
       || target->isJSONArray()
-#endif
       );
+#else
+  assert(target->isNode());
+#endif
 
   const XmlNode* n = static_cast<const XmlNode*>(target);