X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..ebe4af54bde52ca8182e97a3dc8d25449b9c1dbc:/projects/stargazer/actions.inl.h?ds=inline

diff --git a/projects/stargazer/actions.inl.h b/projects/stargazer/actions.inl.h
index c29a63cd..b5b3f8a5 100644
--- a/projects/stargazer/actions.inl.h
+++ b/projects/stargazer/actions.inl.h
@@ -3,7 +3,7 @@
 
 #include <algorithm>
 
-#include "stg_locker.h"
+#include "stg/locker.h"
 
 // Polymorphick action invocation
 template <class ACTIVE_CLASS, typename DATA_TYPE>
@@ -18,7 +18,7 @@ ACTIONS_LIST::ACTIONS_LIST()
     : mutex()
 {
 pthread_mutex_init(&mutex, NULL);
-};
+}
 
 // Delete all actions before deleting list
 inline
@@ -26,7 +26,7 @@ ACTIONS_LIST::~ACTIONS_LIST()
 {
 
     {
-    STG_LOCKER(&mutex, __FILE__, __LINE__);
+    STG_LOCKER lock(&mutex);
 
     parent::iterator it(parent::begin());
     while (it != parent::end()) 
@@ -36,56 +36,56 @@ ACTIONS_LIST::~ACTIONS_LIST()
     }
 
 pthread_mutex_destroy(&mutex);
-};
+}
 
 inline
 ACTIONS_LIST::parent::iterator ACTIONS_LIST::begin()
 { 
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 return parent::begin();
-};
+}
 
 inline
 ACTIONS_LIST::parent::iterator ACTIONS_LIST::end()
 { 
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 return parent::end();
-};
+}
 
 inline
 ACTIONS_LIST::parent::const_iterator ACTIONS_LIST::begin() const
 { 
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 return parent::begin();
-};
+}
 
 inline
 ACTIONS_LIST::parent::const_iterator ACTIONS_LIST::end() const
 { 
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 return parent::end();
-};
+}
 
 inline
 bool ACTIONS_LIST::empty() const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 return parent::empty();
-};
+}
 
 inline
 size_t ACTIONS_LIST::size() const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 return parent::size();
-};
+}
 
 inline
 void ACTIONS_LIST::swap(ACTIONS_LIST & list)
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 parent::swap(list);
-};
+}
 
 template <class ACTIVE_CLASS, typename DATA_TYPE>
 inline
@@ -93,19 +93,19 @@ void ACTIONS_LIST::Enqueue(ACTIVE_CLASS & ac,
                            typename ACTOR<ACTIVE_CLASS, DATA_TYPE>::TYPE a,
                            DATA_TYPE d)
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 push_back(new ACTION<ACTIVE_CLASS, DATA_TYPE>(ac, a, d));
 }
 
 inline
 void ACTIONS_LIST::InvokeAll()
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 std::for_each(
         parent::begin(),
         parent::end(),
         std::mem_fun(&BASE_ACTION::Invoke)
 );
-};
+}
 
 #endif