Merge branch 'origin' of https://github.com/CVC4/CVC4.git

Conflicts:
	src/options/quantifiers_options

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/command_executor_portfolio.cpp b/src/main/command_executor_portfolio.cpp
index 1902e1817..bd8b6a9ed 100644
--- a/src/main/command_executor_portfolio.cpp
+++ b/src/main/command_executor_portfolio.cpp
@@ -277,11 +277,13 @@ bool CommandExecutorPortfolio::doCommandSingleton(Command* cmd)
      * set of variables mapped.)
      */
     if(d_numThreads >= 2) {
-      for(typeof(d_vmaps[1]->d_to.begin()) i=d_vmaps[1]->d_to.begin();
-          i!=d_vmaps[1]->d_to.end(); ++i) {
-        (d_vmaps[0]->d_from)[i->first] = i->first;
+      VarMap& thread_0_from = d_vmaps[0]->d_from;
+      VarMap& thread_1_to = d_vmaps[1]->d_to;
+      for(VarMap::iterator i=thread_1_to.begin();
+          i != thread_1_to.end(); ++i) {
+        thread_0_from[i->first] = i->first;
       }
-      d_vmaps[0]->d_to = d_vmaps[0]->d_from;
+      d_vmaps[0]->d_to = thread_0_from;
     }
 
     lemmaSharingInit();