]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Make compile again.
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Sun, 25 Aug 2013 19:18:08 +0000 (19:18 +0000)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Sun, 25 Aug 2013 19:18:08 +0000 (19:18 +0000)
git-svn-id: https://svn.dealii.org/trunk@30484 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/base/work_stream.h
deal.II/source/base/parameter_handler.cc

index d4c9f9f619ba5972b219eb9cf1dc1048f9692962..370796a7e14f9e9950b25d21cb09429ebc7adb88 100644 (file)
@@ -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)
               {
index a9edbef5e5c915a1c5fba7046e82bacd041d54dd..eb0bde28f45b8d661be72d408783c69407154bed 100644 (file)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.