Merge lp:~zorba-coders/zorba/windows_fix into lp:zorba

[Juan Zacarias]

Added missing header, needed for Windows build

Added missing header, needed for Windows build

[Juan Zacarias (juan457)]

review: Approve

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/windows_fix-2013-04-22T17-12-43.555Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job windows_fix-2013-04-22T17-12-43.555Z 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/windows_fix-2013-04-22T23-28-35.437Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job windows_fix-2013-04-22T23-28-35.437Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/json_items.h'
--- src/store/naive/json_items.h	2013-04-18 03:30:38 +0000
+++ src/store/naive/json_items.h	2013-04-22 16:52:38 +0000
@@ -22,6 +22,7 @@
 #include <zorba/config.h>
 #include "util/stl_util.h"
 #include "util/unordered_map.h"
+#include "util/hash/hash.h"
 
 #include "diagnostics/assert.h"
 
@@ -33,7 +34,6 @@
 #include "simple_collection.h"
 #include "structured_item.h"
 
-
 namespace zorba
 {