Remove std::list from actions.

diff --git a/stargazer/actions.h b/stargazer/actions.h
index 66b8556d1144ab43344378865ecbbc18261fc043..eea72b77aa7357b456b955c35f1b3d33aa18a62f 100644 (file)
--- a/stargazer/actions.h
+++ b/stargazer/actions.h
@@ -14,7 +14,7 @@
 // actionsList.InvokeAll();
 
 #include <pthread.h>
 // actionsList.InvokeAll();
 
 #include <pthread.h>

-#include <list>
+#include <vector>

 #include <functional>
 
 // Generalized actor type - a method of some class with one argument
 #include <functional>
 
 // Generalized actor type - a method of some class with one argument


@@ -54,11 +54,11 @@ private:
 
 // A list of an actions
 // All methods are thread-safe
 
 // A list of an actions
 // All methods are thread-safe

-class ACTIONS_LIST : private std::list<BASE_ACTION *>
+class ACTIONS_LIST : private std::vector<BASE_ACTION *>

 {
 public:
     // Just a typedef for parent class
 {
 public:
     // Just a typedef for parent class

-    typedef std::list<BASE_ACTION *> parent;
+    typedef std::vector<BASE_ACTION *> parent;

 
     // Initialize mutex
     ACTIONS_LIST();
 
     // Initialize mutex
     ACTIONS_LIST();

diff --git a/stargazer/actions.inl.h b/stargazer/actions.inl.h
index b5b3f8a5a20090977ed3f3f2cd43bb8aad5929f4..392626ab67b29cb2605b9454f94bf5460782e0c7 100644 (file)
--- a/stargazer/actions.inl.h
+++ b/stargazer/actions.inl.h
@@ -29,7 +29,7 @@ ACTIONS_LIST::~ACTIONS_LIST()
     STG_LOCKER lock(&mutex);
 
     parent::iterator it(parent::begin());
     STG_LOCKER lock(&mutex);
 
     parent::iterator it(parent::begin());

-    while (it != parent::end()) 
+    while (it != parent::end())

         {
         delete *it++;
         }
         {
         delete *it++;
         }


@@ -40,28 +40,28 @@ pthread_mutex_destroy(&mutex);
 
 inline
 ACTIONS_LIST::parent::iterator ACTIONS_LIST::begin()
 
 inline
 ACTIONS_LIST::parent::iterator ACTIONS_LIST::begin()

-{ 
+{

 STG_LOCKER lock(&mutex);
 return parent::begin();
 }
 
 inline
 ACTIONS_LIST::parent::iterator ACTIONS_LIST::end()
 STG_LOCKER lock(&mutex);
 return parent::begin();
 }
 
 inline
 ACTIONS_LIST::parent::iterator ACTIONS_LIST::end()

-{ 
+{

 STG_LOCKER lock(&mutex);
 return parent::end();
 }
 
 inline
 ACTIONS_LIST::parent::const_iterator ACTIONS_LIST::begin() const
 STG_LOCKER lock(&mutex);
 return parent::end();
 }
 
 inline
 ACTIONS_LIST::parent::const_iterator ACTIONS_LIST::begin() const

-{ 
+{

 STG_LOCKER lock(&mutex);
 return parent::begin();
 }
 
 inline
 ACTIONS_LIST::parent::const_iterator ACTIONS_LIST::end() const
 STG_LOCKER lock(&mutex);
 return parent::begin();
 }
 
 inline
 ACTIONS_LIST::parent::const_iterator ACTIONS_LIST::end() const

-{ 
+{

 STG_LOCKER lock(&mutex);
 return parent::end();
 }
 STG_LOCKER lock(&mutex);
 return parent::end();
 }