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

[Ghislain Fourny]

Fixing Windows build with JSONiq.

Fixing Windows build with JSONiq.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1031287-2012-07-31T10-13-57.498Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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)]

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

[Ghislain Fourny (gislenius)]

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

[Matthias Brantner (matthias-brantner)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1031287-2012-07-31T20-47-56.066Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1031287-2012-07-31T21-40-58.029Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1031287-2012-07-31T21-40-58.029Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-07-24 08:48:48 +0000
+++ src/compiler/translator/translator.cpp	2012-07-31 10:08:22 +0000
@@ -10683,7 +10683,7 @@
 
     pop_scope();
 
-    push_nodestack(flworExpr);
+    push_nodestack(flworExpr.getp());
 
     return;
   }

=== modified file 'src/store/naive/json_loader.cpp'
--- src/store/naive/json_loader.cpp	2012-07-11 15:38:39 +0000
+++ src/store/naive/json_loader.cpp	2012-07-31 10:08:22 +0000
@@ -143,13 +143,13 @@
         case token::end_array:
         case token::end_object:
           {
-            JSONItem_t lItem = lStack.back();
+            store::Item_t lItem = lStack.back();
 
             lStack.pop_back();
 
             if (lStack.empty())
             {
-              lRootItem = lItem;
+              lRootItem = lItem.cast<JSONItem>();
             }
             else
             {