Merge branch 'stg-2.409-radius'

[stg.git] / projects / stargazer / eventloop.h

diff --git a/projects/stargazer/eventloop.h b/projects/stargazer/eventloop.h
index e1b7f6aac8da02efc512e39e9a53737e4bf2a7d7..0e7981421ea289858b31beda001e859d707e7358 100644 (file)
--- a/projects/stargazer/eventloop.h
+++ b/projects/stargazer/eventloop.h
@@ -3,7 +3,7 @@
 
 #include <pthread.h>
 
-#include "noncopyable.h"
+#include "stg/noncopyable.h"
 #include "actions.h"
 
 class EVENT_LOOP : private NONCOPYABLE,
@@ -12,7 +12,7 @@ class EVENT_LOOP : private NONCOPYABLE,
     public:
         bool Start();
         bool Stop();
-        bool IsRunning() const { return _running; };
+        bool IsRunning() const { return _running; }
 
         template <class ACTIVE_CLASS, typename DATA_TYPE>
         void Enqueue(ACTIVE_CLASS & ac,
@@ -44,8 +44,8 @@ class EVENT_LOOP_SINGLETON : private NONCOPYABLE
         static EVENT_LOOP * _instance;
         static void CreateInstance();
 
-        EVENT_LOOP_SINGLETON() {};
-        ~EVENT_LOOP_SINGLETON() {};
+        EVENT_LOOP_SINGLETON() {}
+        ~EVENT_LOOP_SINGLETON() {}
 };
 
 template <class ACTIVE_CLASS, typename DATA_TYPE>
@@ -53,7 +53,7 @@ void EVENT_LOOP::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);
 // Add new action
 ACTIONS_LIST::Enqueue(ac, a, d);
 // Signal about new action