From: Timo Heister Date: Tue, 17 Feb 2015 11:33:33 +0000 (-0500) Subject: fix multithread_info when THREADS=OFF X-Git-Tag: v8.3.0-rc1~451^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F560%2Fhead;p=dealii.git fix multithread_info when THREADS=OFF static members have to be initialized even if deal.II is configured without multithreading. --- diff --git a/source/base/multithread_info.cc b/source/base/multithread_info.cc index 453dee100e..65e0a2a7cb 100644 --- a/source/base/multithread_info.cc +++ b/source/base/multithread_info.cc @@ -98,9 +98,6 @@ unsigned int MultithreadInfo::get_n_cpus() # endif -const unsigned int MultithreadInfo::n_cpus = MultithreadInfo::get_n_cpus(); -unsigned int MultithreadInfo::n_max_threads = numbers::invalid_unsigned_int; - unsigned int MultithreadInfo::n_cores() { return MultithreadInfo::n_cpus; @@ -210,6 +207,9 @@ MultithreadInfo::memory_consumption () } +const unsigned int MultithreadInfo::n_cpus = MultithreadInfo::get_n_cpus(); +unsigned int MultithreadInfo::n_max_threads = numbers::invalid_unsigned_int; + // definition of the variable which is declared `extern' in the .h file MultithreadInfo multithread_info;