From: Martin Kronbichler Date: Sun, 25 Aug 2013 19:18:08 +0000 (+0000) Subject: Make compile again. X-Git-Tag: v8.1.0~961 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20c81cf6ae833e4b0e0d7fee13f4c6350001d0be;p=dealii.git Make compile again. git-svn-id: https://svn.dealii.org/trunk@30484 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/base/work_stream.h b/deal.II/include/deal.II/base/work_stream.h index d4c9f9f619..370796a7e1 100644 --- a/deal.II/include/deal.II/base/work_stream.h +++ b/deal.II/include/deal.II/base/work_stream.h @@ -530,9 +530,10 @@ namespace WorkStream { try { - worker (current_item->work_items[i], - *scratch_data, - current_item->copy_datas[i]); + if (worker.empty() == false) + worker (current_item->work_items[i], + *scratch_data, + current_item->copy_datas[i]); } catch (const std::exception &exc) { @@ -633,7 +634,8 @@ namespace WorkStream { try { - copier (current_item->copy_datas[i]); + if (copier.empty() == false) + copier (current_item->copy_datas[i]); } catch (const std::exception &exc) { diff --git a/deal.II/source/base/parameter_handler.cc b/deal.II/source/base/parameter_handler.cc index a9edbef5e5..eb0bde28f4 100644 --- a/deal.II/source/base/parameter_handler.cc +++ b/deal.II/source/base/parameter_handler.cc @@ -2414,7 +2414,7 @@ ParameterHandler::scan_line (std::string line, return false; } - std::ifstream input (line); + std::ifstream input (line.c_str()); if (!input) { std::cerr << "Line <" << lineno