take a reference instead of a pointer in Blocks::dfsVisit

This function has no ability to deal with being passed null, so it is cleaner to
accept a reference.

diff --git a/lib/vpsc/blocks.cpp b/lib/vpsc/blocks.cpp
index a41a3e016c741cfac73f650c6976771a0dbe925b..47ae790e613f8bf260aac3dae851da785826eefc 100644 (file)
--- a/lib/vpsc/blocks.cpp
+++ b/lib/vpsc/blocks.cpp
@@ -61,14 +61,14 @@ list<Variable*> *Blocks::totalOrder() {
        }
        for(int i=0;i<nvs;i++) {
                if(vs[i]->in.empty()) {
-                       dfsVisit(vs[i],order);
+                       dfsVisit(vs[i],*order);
                }
        }
        return order;
 }
 // Recursive depth first search giving total order by pushing nodes in the DAG
 // onto the front of the list when we finish searching them
-void Blocks::dfsVisit(Variable *v, list<Variable*> *order) {
+void Blocks::dfsVisit(Variable *v, list<Variable*> &order) {
        v->visited=true;
        vector<Constraint*>::iterator it=v->out.begin();
        for(;it!=v->out.end();it++) {
@@ -81,7 +81,7 @@ void Blocks::dfsVisit(Variable *v, list<Variable*> *order) {
                ofstream f(LOGFILE,ios::app);
                f<<"  order="<<*v<<"\n";
        }
-       order->push_front(v);
+       order.push_front(v);
 }
 /**
  * Processes incoming constraints, most violated to least, merging with the

diff --git a/lib/vpsc/blocks.h b/lib/vpsc/blocks.h
index 7c3af91ee208dc532ed28376e7dc77e48799af51..b5b5442368aca541984fc3008861634b26e5882b 100644 (file)
--- a/lib/vpsc/blocks.h
+++ b/lib/vpsc/blocks.h
@@ -46,7 +46,7 @@ public:
        void cleanup();
        double cost();
 private:
-       void dfsVisit(Variable *v, std::list<Variable*> *order);
+       void dfsVisit(Variable *v, std::list<Variable*> &order);
        void removeBlock(Block *doomed);
        Variable **vs;
        int nvs;