Enhanced config serializer.

[stg.git] / projects / stargazer / actions.inl.h

diff --git a/projects/stargazer/actions.inl.h b/projects/stargazer/actions.inl.h
index c29a63cda1a3a5ea564326434d930b5d2981a331..1a8102285972c31fcb8b17af18095b422a426001 100644 (file)
--- a/projects/stargazer/actions.inl.h
+++ b/projects/stargazer/actions.inl.h
@@ -3,7 +3,7 @@
 
 #include <algorithm>
 
 
 #include <algorithm>
 

-#include "stg_locker.h"
+#include "stg/locker.h"

 
 // Polymorphick action invocation
 template <class ACTIVE_CLASS, typename DATA_TYPE>
 
 // Polymorphick action invocation
 template <class ACTIVE_CLASS, typename DATA_TYPE>


@@ -18,7 +18,7 @@ ACTIONS_LIST::ACTIONS_LIST()
     : mutex()
 {
 pthread_mutex_init(&mutex, NULL);
     : mutex()
 {
 pthread_mutex_init(&mutex, NULL);

-};
+}

 
 // Delete all actions before deleting list
 inline
 
 // Delete all actions before deleting list
 inline


@@ -26,7 +26,7 @@ ACTIONS_LIST::~ACTIONS_LIST()
 {
 
     {
 {
 
     {

-    STG_LOCKER(&mutex, __FILE__, __LINE__);
+    STG_LOCKER lock(&mutex, __FILE__, __LINE__);

 
     parent::iterator it(parent::begin());
     while (it != parent::end()) 
 
     parent::iterator it(parent::begin());
     while (it != parent::end()) 


@@ -36,56 +36,56 @@ ACTIONS_LIST::~ACTIONS_LIST()
     }
 
 pthread_mutex_destroy(&mutex);
     }
 
 pthread_mutex_destroy(&mutex);

-};
+}

 
 inline
 ACTIONS_LIST::parent::iterator ACTIONS_LIST::begin()
 { 
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::begin();
 
 inline
 ACTIONS_LIST::parent::iterator ACTIONS_LIST::begin()
 { 
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::begin();

-};
+}

 
 inline
 ACTIONS_LIST::parent::iterator ACTIONS_LIST::end()
 { 
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::end();
 
 inline
 ACTIONS_LIST::parent::iterator ACTIONS_LIST::end()
 { 
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::end();

-};
+}

 
 inline
 ACTIONS_LIST::parent::const_iterator ACTIONS_LIST::begin() const
 { 
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::begin();
 
 inline
 ACTIONS_LIST::parent::const_iterator ACTIONS_LIST::begin() const
 { 
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::begin();

-};
+}

 
 inline
 ACTIONS_LIST::parent::const_iterator ACTIONS_LIST::end() const
 { 
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::end();
 
 inline
 ACTIONS_LIST::parent::const_iterator ACTIONS_LIST::end() const
 { 
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::end();

-};
+}

 
 inline
 bool ACTIONS_LIST::empty() const
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::empty();
 
 inline
 bool ACTIONS_LIST::empty() const
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::empty();

-};
+}

 
 inline
 size_t ACTIONS_LIST::size() const
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::size();
 
 inline
 size_t ACTIONS_LIST::size() const
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 return parent::size();

-};
+}

 
 inline
 void ACTIONS_LIST::swap(ACTIONS_LIST & list)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 parent::swap(list);
 
 inline
 void ACTIONS_LIST::swap(ACTIONS_LIST & list)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 parent::swap(list);

-};
+}

 
 template <class ACTIVE_CLASS, typename DATA_TYPE>
 inline
 
 template <class ACTIVE_CLASS, typename DATA_TYPE>
 inline


@@ -106,6 +106,6 @@ std::for_each(
         parent::end(),
         std::mem_fun(&BASE_ACTION::Invoke)
 );
         parent::end(),
         std::mem_fun(&BASE_ACTION::Invoke)
 );

-};
+}

 
 #endif
 
 #endif