From dd86955000cbb03119c26279dd0c061acb817ee9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 4 Oct 2009 14:47:22 +0000 Subject: small cleanup --- src/signalController.cpp | 6 +----- src/signalController.h | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'src') diff --git a/src/signalController.cpp b/src/signalController.cpp index b3029c3..75ba32c 100644 --- a/src/signalController.cpp +++ b/src/signalController.cpp @@ -149,10 +149,6 @@ SignalController::~SignalController() { for(HandlerMap::iterator it = handler.begin(); it != handler.end(); ++it) delete it->second; - -#ifndef _MSC_VER - if(thread) delete thread; -#endif } #ifndef _MSC_VER @@ -193,7 +189,7 @@ void SignalController::init() #error The signalhandler works only with pthreads #endif - thread = new boost::thread(boost::bind(&SignalController::handle, this)); + boost::thread(boost::bind(&SignalController::handle, this)); handler[SIGINT] = new SigIntHandler; handler[SIGQUIT] = new SigQuitHandler; diff --git a/src/signalController.h b/src/signalController.h index 575b50b..78bfdcc 100644 --- a/src/signalController.h +++ b/src/signalController.h @@ -164,11 +164,7 @@ public: private: typedef std::map HandlerMap; -#ifndef _MSC_VER - SignalController() : thread(NULL) {}; -#else SignalController() {}; -#endif ~SignalController(); SignalController(const SignalController &s); void operator=(const SignalController &s); @@ -188,9 +184,6 @@ private: Mutex sigQueueMutex; Semaphore sigQueueSem; -#ifndef _MSC_VER - boost::thread* thread; -#endif HandlerMap handler; }; -- cgit v1.2.3