Permalink
Browse files

Merge branch 'unstable' into topic/opencl

  • Loading branch information...
2 parents 1a8be14 + f40031d commit 9b7c4cd3254ecd9995403cba311a7c42ec71ac5a @Neverlord Neverlord committed Mar 21, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/logging.cpp
  2. +1 −1 src/thread_pool_scheduler.cpp
View
@@ -84,7 +84,7 @@ class logging_impl : public logging {
void operator()() {
ostringstream fname;
fname << "libcppa_" << getpid() << "_" << time(0) << ".log";
- fstream out(fname.str().c_str(), ios::app);
+ fstream out(fname.str().c_str(), ios::out);
unique_ptr<log_event> event;
for (;;) {
event.reset(m_queue.pop());
@@ -133,7 +133,7 @@ void thread_pool_scheduler::worker_loop(thread_pool_scheduler::worker* w) {
}
thread_pool_scheduler::thread_pool_scheduler() {
- m_num_threads = std::max<size_t>(std::thread::hardware_concurrency()*2, 4);
+ m_num_threads = std::max<size_t>(std::thread::hardware_concurrency(), 4);
}
thread_pool_scheduler::thread_pool_scheduler(size_t num_worker_threads) {

0 comments on commit 9b7c4cd

Please sign in to comment.