From: Kshitij Bansal <kshitij@cs.nyu.edu>
Date: Wed, 9 Apr 2014 16:21:07 +0000 (-0400)
Subject: try foreach on CD datastructure
X-Git-Tag: cvc5-1.0.0~6977^2~4
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b7af8484a897d0ed88dd30a3dd52383903a54b14;p=cvc5.git

try foreach on CD datastructure
---

diff --git a/src/context/cdlist.h b/src/context/cdlist.h
index 47d112cd8..c57a315f5 100644
--- a/src/context/cdlist.h
+++ b/src/context/cdlist.h
@@ -417,6 +417,7 @@ public:
     }
 
   };/* class CDList<>::const_iterator */
+  typedef const_iterator iterator;
 
   /**
    * Returns an iterator pointing to the first item in the list.
diff --git a/src/theory/sets/theory_sets_private.cpp b/src/theory/sets/theory_sets_private.cpp
index 2cc182819..42d417fc3 100644
--- a/src/theory/sets/theory_sets_private.cpp
+++ b/src/theory/sets/theory_sets_private.cpp
@@ -1066,18 +1066,17 @@ void TheorySetsPrivate::TermInfoManager::addTerm(TNode n) {
 void TheorySetsPrivate::TermInfoManager::pushToSettermPropagationQueue
 (CDTNodeList* l, TNode S, bool polarity)
 {
-  for(typeof(l->begin()) i = l->begin(); i != l->end(); ++i) {
+  BOOST_FOREACH(TNode x, (*l) ) {
     Debug("sets-prop") << "[sets-terminfo]  setterm todo: "
-                       << MEMBER(*i, d_eqEngine->getRepresentative(S))
+                       << MEMBER(x, d_eqEngine->getRepresentative(S))
                        << std::endl;
 
-    d_eqEngine->addTerm(MEMBER(d_eqEngine->getRepresentative(*i),
+    d_eqEngine->addTerm(MEMBER(d_eqEngine->getRepresentative(x),
 			       d_eqEngine->getRepresentative(S)));
 
     for(eq::EqClassIterator j(d_eqEngine->getRepresentative(S), d_eqEngine);
         !j.isFinished(); ++j) {
 
-      TNode x = (*i);
       TNode S = (*j);
       Node cur_atom = MEMBER(x, S);