Zorba

Merge lp:~davidagraf/zorba/windows-build-fix into lp:zorba

  1. windows-build-fix
  2. Merge into trunk
Proposed by David Graf
Status: Merged
Approved by: David Graf
Approved revision: 10909
Merged at revision: 10909
Proposed branch: lp:~davidagraf/zorba/windows-build-fix
Merge into: lp:zorba
Diff against target: 19 lines (+4/-2)
1 file modified
src/store/naive/simple_pul.cpp (+4/-2)
To merge this branch: bzr merge lp:~davidagraf/zorba/windows-build-fix
Reviewer Review Type Date Requested Status
Dennis Knochenwefel Approve
David Graf (community) Approve
Review via email: mp+113196@code.launchpad.net

Commit message

windows build fix

Description of the change

windows build fix

To post a comment you must log in.
Revision history for this message
David Graf (davidagraf) :
review: Approve
Revision history for this message
Dennis Knochenwefel (dennis-knochenwefel) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/windows-build-fix-2012-07-03T11-15-09.303Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job windows-build-fix-2012-07-03T11-15-09.303Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/store/naive/simple_pul.cpp'
2--- src/store/naive/simple_pul.cpp 2012-06-28 04:14:03 +0000
3+++ src/store/naive/simple_pul.cpp 2012-07-03 10:54:18 +0000
4@@ -167,12 +167,14 @@
5 {
6 const QNameItem* collName;
7
8+#ifdef ZORBA_WITH_JSON
9 assert(target->isNode()
10-#ifdef ZORBA_WITH_JSON
11 || target->isJSONObject()
12 || target->isJSONArray()
13-#endif
14 );
15+#else
16+ assert(target->isNode());
17+#endif
18
19 const XmlNode* n = static_cast<const XmlNode*>(target);
20

Subscribers

People subscribed via source and target branches