Zorba 2.8 debug build test failure on Windows Server 2003

I built Zorba2.8 on Windows Server 2003 with VS2010 and ran test after build, but some test cases crashed. I found that these crashes are located at src\compiler\rewriter\rules\flwor_rules.cpp line 259. The following is the related code:
     for(; ite != end; ++ite)
      {
        var_expr* var = ite->second;
        int uses = expr_tools::count_variable_uses(theFlwor, var, 1, NULL);

        if (uses == 0 && !ite->first->isNonDiscardable())
        {
          gc->removeNonGroupingVar(ite);
          --ite;
          end = gc->endNonGroupVars();
        }
      }
According to C++ API, http://www.cplusplus.com/reference/vector/vector/erase/. The iterator pointing to ite and beyond are invalidated. So the behavior of "--ite" is unexpected. To solve this problem, the vector::erase() has a return value, an iterator pointing to the new location of the element that followed the last element erased. Maybe we change it to the following code:
  while(ite != end)
  {
 var_expr* var = ite->second;
 int uses = expr_tools::count_variable_uses(theFlwor, var, 1, NULL);

 if (uses == 0 && !ite->first->isNonDiscardable())
 {
   ite = gc->removeNonGroupingVar(ite);
   end = gc->endNonGroupVars();
 }
 else
 {
   ++ite;
 }
  }
And we should change the return value type of removeNonGroupingVar from "void" to "iterator".