zorba-coders team mailing list archive

[Rodolfo Ochoa <rodolfo.ochoa@xxxxxxxxx>]

Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1083269 into lp:zorba.

Requested reviews:
  Chris Hillery (ceejatec)
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #1083269 in Zorba: "Windows Build Broken"
  https://bugs.launchpad.net/zorba/+bug/1083269

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1083269/+merge/139125

Fix for errors on windows that avoid to be compiled. Read comments on bug.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1083269/+merge/139125
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/expression/expr_clone.cpp'
--- src/compiler/expression/expr_clone.cpp	2012-12-06 22:49:35 +0000
+++ src/compiler/expression/expr_clone.cpp	2012-12-11 00:27:20 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include "compiler/expression/expr_base.h"
 #include "compiler/expression/update_exprs.h"
 #include "compiler/expression/expr.h"

=== modified file 'src/context/dynamic_context.cpp'
--- src/context/dynamic_context.cpp	2012-10-22 17:08:12 +0000
+++ src/context/dynamic_context.cpp	2012-12-11 00:27:20 +0000
@@ -15,6 +15,10 @@
  */
 #include "stdafx.h"
 
+#ifdef WIN32
+#include <sys/types.h>
+#include <sys/timeb.h>
+#endif
 #include "common/common.h"
 #include <assert.h>
 #include <time.h>
@@ -23,7 +27,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-
 #include "store/api/iterator.h"
 #include "store/api/temp_seq.h"
 #include "store/api/item_factory.h"

=== modified file 'src/functions/func_schema_impl.cpp'
--- src/functions/func_schema_impl.cpp	2012-10-15 13:35:59 +0000
+++ src/functions/func_schema_impl.cpp	2012-12-11 00:27:20 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include "functions/func_schema.h"
 
 #include "compiler/expression/expr_base.h"

=== modified file 'src/precompiled/stdafx.h'
--- src/precompiled/stdafx.h	2012-10-08 12:09:36 +0000
+++ src/precompiled/stdafx.h	2012-12-11 00:27:20 +0000
@@ -29,6 +29,7 @@
   #include <crtdefs.h>
   #include <map>
   #include <set>
+  #include <sys/timeb.h>
 
   #include "runtime/sequences/sequences.h"
   #include "diagnostics/xquery_diagnostics.h"
@@ -58,17 +59,19 @@
   #include "zorbatypes/m_apm.h"
   #include "zorbatypes/rclock.h"
   #include "zorbatypes/schema_types.h"
+//
   #include "zorbatypes/timezone.h"
   #include "zorbatypes/URI.h"
   #include "zorbatypes/xerces_xmlcharray.h"
   #include "zorbatypes/zorbatypes_decl.h"
   #include "zorbatypes/zstring.h"
   #include "zorbautils/condition.h"
-  #include "zorbautils/hashfun.h"
+
   #include "zorbautils/hashmap.h"
   #include "zorbautils/hashmap_itemp.h"
   #include "zorbautils/hashmap_zstring.h"
   #include "zorbautils/hashset.h"
+  
   #include "zorbautils/latch.h"
   #include "zorbautils/locale.h"
   #include "zorbautils/lock.h"
@@ -83,6 +86,5 @@
   #include "runtime/full_text/ftcontains_visitor.h"
   #include "store/api/ft_token_iterator.h"
   #include "store/naive/ft_token_store.h"
-
 #endif
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/unit_tests/test_hashmaps.cpp'
--- src/unit_tests/test_hashmaps.cpp	2012-11-12 21:17:32 +0000
+++ src/unit_tests/test_hashmaps.cpp	2012-12-11 00:27:20 +0000
@@ -1,4 +1,5 @@
 
+#include "stdafx.h"
 #include <cstdlib>
 #include <stdio.h>
 #include <iostream>
@@ -9,7 +10,6 @@
 #include "util/hashmap32.h"
 #include "util/hashmap.h"
 #include "util/unordered_map.h"
-#include "util/hash/hash.h"
 
 namespace zorba {
 
@@ -94,7 +94,7 @@
   HashMap<zstring, int, StrCompFunc> map2(1024, false);
 
   std::unordered_map<uint64_t, int> map3(1024);
-  std::unordered_map<zstring, int> map4(1024);
+  std::unordered_map<std::string, int> map4(1024);
 
   hash64map<int> map5(1024, load_factor);
   hashmap<zstring, int> map6(1024, load_factor);
@@ -182,7 +182,7 @@
     {
       zstring key = str_buf[i];
       int value = 1;
-      (void)map4.insert(std::pair<zstring, int>(key, value));
+      (void)map4.insert(std::pair<std::string, int>(key.c_str(), value));
     }
 
     zorba::time::walltime stopTime;