From 1b6813e6ad381920b6300e6d45f3b83574c4a317 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 16 Nov 2013 08:31:05 +0000 Subject: [PATCH] Bugfix: Define FP_USE_THREAD_SAFE_EVAL in case of enabled multithreading support. git-svn-id: https://svn.dealii.org/trunk@31682 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/functionparser/CMakeLists.txt | 3 +++ deal.II/doc/news/changes.h | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/deal.II/bundled/functionparser/CMakeLists.txt b/deal.II/bundled/functionparser/CMakeLists.txt index 9fb68b95dc..eaf39a348c 100644 --- a/deal.II/bundled/functionparser/CMakeLists.txt +++ b/deal.II/bundled/functionparser/CMakeLists.txt @@ -26,3 +26,6 @@ DEAL_II_ADD_LIBRARY(obj_functionparser OBJECT fpoptimizer.cc ) +IF(DEAL_II_WITH_THREADS) + DEAL_II_ADD_DEFINITIONS(obj_functionparser "FP_USE_THREAD_SAFE_EVAL") +ENDIF() diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index b5997b9a33..4e97f5aaa3 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -211,6 +211,12 @@ inconvenience this causes.

Specific improvements

    +
  1. Fixed: Bundled fparser is now compiled with FP_USE_THREAD_SAFE_EVAL in + case of enabled threading support so that it is thread safe. +
    + (Matthias Maier, reported by Francesco Cattoglio 2013/11/16) +
  2. +
  3. Fixed: The CellData class now has a default constructor that sets the material and boundary indicators to zero. This fixes certain internal errors with the Intel ICC compiler. -- 2.39.5