Luis Rodriguez Gonzalez has proposed merging 
lp:~zorba-coders/zorba/zorba-windows-fixes into lp:zorba.

Requested reviews:
  Rodolfo Ochoa (rodolfo-ochoa)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fixes/+merge/141005

- Fixes for Windows and VC++ 2010
-- 
https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fixes/+merge/141005
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/rewriter/tools/dataflow_annotations.cpp'
--- src/compiler/rewriter/tools/dataflow_annotations.cpp	2012-12-06 22:49:35 +0000
+++ src/compiler/rewriter/tools/dataflow_annotations.cpp	2012-12-20 22:25:25 +0000
@@ -919,7 +919,7 @@
 
     case var_expr::arg_var:
     {
-      theVarSourcesMap.insert(VarSourcesPair(e, NULL));
+      theVarSourcesMap.insert(VarSourcesPair(e, nullptr));
 
       return;
     }

=== modified file 'src/zorbautils/hashmap.h'
--- src/zorbautils/hashmap.h	2012-10-29 12:37:50 +0000
+++ src/zorbautils/hashmap.h	2012-12-20 22:25:25 +0000
@@ -513,9 +513,9 @@
   csize n = theHashTab.size();
 
   HashEntry<T, V>* entry = &theHashTab[0];
-  HashEntry<T, V>* lastentry = &theHashTab[n];
+  HashEntry<T, V>* lastentry = &theHashTab[n-1];
 
-  for (; entry < lastentry; ++entry)
+  for (; entry <= lastentry; ++entry)
   {
     if (!entry->isFree())
       entry->setFree();
@@ -1065,10 +1065,10 @@
 
   HashEntry<T, V>* entry;
   HashEntry<T, V>* oldentry = &oldTab[0];
-  HashEntry<T, V>* lastentry = &oldTab[oldcap];
+  HashEntry<T, V>* lastentry = &oldTab[oldcap-1];
 
   // Now rehash every entry
-  for (; oldentry < lastentry; ++oldentry)
+  for (; oldentry <= lastentry; ++oldentry)
   {
     if (oldentry->isFree())
       continue;

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to