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

Proposed by Ghislain Fourny on 2012-07-31
Status: Merged
Approved by: Chris Hillery on 2012-07-31
Approved revision: 10960
Merged at revision: 10962
Proposed branch: lp:~zorba-coders/zorba/bug-1031287
Merge into: lp:zorba
Diff against target: 32 lines (+3/-3)
2 files modified
src/compiler/translator/translator.cpp (+1/-1)
src/store/naive/json_loader.cpp (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1031287
Reviewer Review Type Date Requested Status
Chris Hillery 2012-07-31 Approve on 2012-07-31
Matthias Brantner 2012-07-31 Approve on 2012-07-31
Review via email: mp+117402@code.launchpad.net

Commit message

Fixing Windows build with JSONiq.

Description of the change

Fixing Windows build with JSONiq.

To post a comment you must log in.
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-1031287-2012-07-31T10-13-57.498Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Pending.

Ghislain Fourny (gislenius) wrote :

Windows seems to now correctly build, and test results show no apparent regression.

review: Approve
Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/bug-1031287 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-1031287-2012-07-31T20-47-56.066Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-1031287-2012-07-31T21-40-58.029Z 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/compiler/translator/translator.cpp'
2--- src/compiler/translator/translator.cpp 2012-07-24 08:48:48 +0000
3+++ src/compiler/translator/translator.cpp 2012-07-31 10:08:22 +0000
4@@ -10683,7 +10683,7 @@
5
6 pop_scope();
7
8- push_nodestack(flworExpr);
9+ push_nodestack(flworExpr.getp());
10
11 return;
12 }
13
14=== modified file 'src/store/naive/json_loader.cpp'
15--- src/store/naive/json_loader.cpp 2012-07-11 15:38:39 +0000
16+++ src/store/naive/json_loader.cpp 2012-07-31 10:08:22 +0000
17@@ -143,13 +143,13 @@
18 case token::end_array:
19 case token::end_object:
20 {
21- JSONItem_t lItem = lStack.back();
22+ store::Item_t lItem = lStack.back();
23
24 lStack.pop_back();
25
26 if (lStack.empty())
27 {
28- lRootItem = lItem;
29+ lRootItem = lItem.cast<JSONItem>();
30 }
31 else
32 {

Subscribers

People subscribed via source and target branches