nodestack: remove unnecessary typedefs

These typedefs are used once or twice and don't add much meaning.

diff --git a/nodestack.cc b/nodestack.cc
index 02f5a89ef17fa320a4fed704e95a924fba0b5132..75ca012b2b65c4fe48eae6bb7f9cfccf109cd118 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -52,9 +52,8 @@ void Node::print()
 /** @brief Prints info about may_read_from set */
 void Node::print_may_read_from()
 {
-       readfrom_set_t::iterator it;
-       for (it = may_read_from.begin(); it != may_read_from.end(); it++)
-               (*it)->print();
+       for (unsigned int i = 0; i < may_read_from.size(); i++)
+               may_read_from[i]->print();
 }
 
 /**

diff --git a/nodestack.h b/nodestack.h
index fc3bf1d0911c8e43da840332ffa0b41758431fd9..996bdf3f68fc51e72534815e5caebeab8dc77014 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -13,10 +13,6 @@
 
 class ModelAction;
 
-typedef std::vector< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
-typedef std::vector< uint64_t, MyAlloc< uint64_t > > futurevalues_t;
-typedef std::vector< uint32_t, MyAlloc< uint32_t > > promises_t;
-
 /**
  * @brief A single node in a NodeStack
  *
@@ -77,11 +73,12 @@ private:
 
        /** The set of ModelActions that this the action at this Node may read
         *  from. Only meaningful if this Node represents a 'read' action. */
-       readfrom_set_t may_read_from;
+       std::vector< const ModelAction *, MyAlloc< const ModelAction * > > may_read_from;
+
        unsigned int read_from_index;
 
-       futurevalues_t future_values;
-       promises_t promises;
+       std::vector< uint64_t, MyAlloc< uint64_t > > future_values;
+       std::vector< uint32_t, MyAlloc< uint32_t > > promises;
        unsigned int future_index;
 };