Zorba

Merge lp:~zorba-coders/zorba/bug-1262732 into lp:zorba

  1. bug-1262732
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Merged at revision: 11679
Proposed branch: lp:~zorba-coders/zorba/bug-1262732
Merge into: lp:zorba
Diff against target: 13 lines (+3/-0)
1 file modified
src/store/naive/node_items.cpp (+3/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1262732
Reviewer Review Type Date Requested Status
William Candillon Approve
Matthias Brantner Approve
Review via email: mp+199785@code.launchpad.net

Commit message

patch for bug #1262732 'error [zerr:ZXQP0002]: "false": assertion failed'

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
William Candillon (wcandillon) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1262732/+merge/199785

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

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

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/store/naive/node_items.cpp'
2--- src/store/naive/node_items.cpp 2013-09-17 21:12:49 +0000
3+++ src/store/naive/node_items.cpp 2013-12-20 10:36:38 +0000
4@@ -411,6 +411,9 @@
5 }
6
7 assert(ite != end);
8+ } else if (relPos == OrdPath::SELF)
9+ {
10+ return 1;
11 }
12 else
13 {

Subscribers

People subscribed via source and target branches