zorba-coders team mailing list archive

[Rodolfo Ochoa <rodolfo.ochoa@xxxxxxxxx>]

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

Commit message:
Fix for Windows and C++11 compatibility

Requested reviews:
  Juan Zacarias (juan457)
  Markos Zaharioudakis (markos-za)
Related bugs:
  Bug #1070998 in Zorba: "C++11 Compiling error on Windows"
  https://bugs.launchpad.net/zorba/+bug/1070998

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

Fix for Windows and C++11 compatibility
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1070998/+merge/131457
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-10-24 11:32:56 +0000
+++ src/compiler/expression/expr_clone.cpp	2012-10-25 17:21:22 +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/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-10-25 17:21:22 +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/unit_tests/test_hashmaps.cpp'
--- src/unit_tests/test_hashmaps.cpp	2012-09-19 05:15:49 +0000
+++ src/unit_tests/test_hashmaps.cpp	2012-10-25 17:21:22 +0000
@@ -1,4 +1,20 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
+#include "stdafx.h"
 #include <cstdlib>
 #include <stdio.h>
 #include <iostream>
@@ -94,7 +110,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);
@@ -180,9 +196,9 @@
 
     for (int i = 0; i < num; ++i)
     {
-      zstring key = str_buf[i];
+      std::string key = str_buf[i].c_str();
       int value = 1;
-      (void)map4.insert(std::pair<zstring, int>(key, value));
+      (void)map4.insert(std::pair<std::string, int>(key, value));
     }
 
     zorba::time::walltime stopTime;