From 31f64f02273f93c9a07afc0d3ed2adbca840e937 Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Mon, 12 Nov 2007 15:58:32 +0000 Subject: [PATCH] Fixed MultiThread info on Intel Macs. git-svn-id: https://svn.dealii.org/trunk@15487 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/source/multithread_info.cc | 6 +++--- deal.II/doc/news/changes.h | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/deal.II/base/source/multithread_info.cc b/deal.II/base/source/multithread_info.cc index a4f5c608bb..520d5cbdae 100644 --- a/deal.II/base/source/multithread_info.cc +++ b/deal.II/base/source/multithread_info.cc @@ -27,7 +27,7 @@ # include #endif -#if defined(__MACH__) && defined(__ppc__) && defined(__APPLE__) +#if defined(__MACH__) && defined(__APPLE__) # include # include #endif @@ -88,9 +88,9 @@ unsigned int MultithreadInfo::get_n_cpus() return sysconf(_SC_NPROC_ONLN); } -# elif defined(__MACH__) && defined(__ppc__) && defined(__APPLE__) +# elif defined(__MACH__) && defined(__APPLE__) // This is only tested on a dual G5 2.5GHz running MacOSX 10.3.6 -// and gcc version 3.3 20030304 (Apple Computer, Inc. build 1666) +// and on an Intel Mac Book Pro. // If it doesnt work please contact the mailinglist. unsigned int MultithreadInfo::get_n_cpus() { diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 2841e6f913..c6856b32cd 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -120,6 +120,12 @@ inconvenience this causes.

base

    +
  1. Fixed: MultithreadInfo::n_cpus now gives the correct result + also on my Intel MacBook Pro. +
    + (Luca Heltai 2007/11/12) +

  2. +
  3. New: There is now a template numbers::NumberTraits that provides the means to implement linear algebra and other algorithms for both real and complex data types. -- 2.39.5