tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gunnarbeutner/strawberry

This commit is contained in:
Gunnar Beutner 2012-06-18 01:44:10 +02:00
parent 74bae58f21 86ffd15eb9
commit f41032e69b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/threadpool.h
View File

@ -12,7 +12,7 @@ public:
typedef function<void()> Task; typedef function<void()> Task;
ThreadPool(long numThreads = 16); ThreadPool(long numThreads = 64);
~ThreadPool(void); ~ThreadPool(void);
static ThreadPool::Ptr GetDefaultPool(void); static ThreadPool::Ptr GetDefaultPool(void);

2
base/timer.cpp
View File

@ -131,8 +131,6 @@ void Timer::Start(void)
Stop(); Stop();
Timers.push_back(GetSelf()); Timers.push_back(GetSelf());
Reschedule(time(NULL) + m_Interval);
} }
/** /**