TEST_SETTINGS_LOCAL moved outside the namespace, more assertions added

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

diff --git a/projects/stargazer/actions.inl.h b/projects/stargazer/actions.inl.h
index c29a63cda1a3a5ea564326434d930b5d2981a331..d7874373e949b2dc753f01ec12b5b5ff2782fa89 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>


@@ -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())