From: bangerth Date: Mon, 30 Sep 2013 14:15:20 +0000 (+0000) Subject: Add a copy constructor in hopes of making Intel's ICC happy. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38463c4b475b52cfc76790f5baf7eacdbc14dff8;p=dealii-svn.git Add a copy constructor in hopes of making Intel's ICC happy. git-svn-id: https://svn.dealii.org/trunk@31036 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 21dfb52d09..8a28dd33f4 100644 --- a/deal.II/include/deal.II/base/work_stream.h +++ b/deal.II/include/deal.II/base/work_stream.h @@ -186,6 +186,12 @@ namespace WorkStream scratch_data (p), currently_in_use (in_use) {} + + ScratchDataObject (const ScratchDataObject &o) + : + scratch_data (new ScratchData(*o.scratch_data)), + currently_in_use (false) + {} }; @@ -455,7 +461,7 @@ namespace WorkStream /** * This flag is used to know if graph coloring is used or not. - */ + */ bool color; /** @@ -513,9 +519,9 @@ namespace WorkStream template - class Worker : public tbb::filter - { - public: + class Worker : public tbb::filter + { + public: /** * Constructor. Takes a * reference to the object on @@ -936,7 +942,7 @@ namespace WorkStream Copier copier, const ScratchData &sample_scratch_data, const CopyData &sample_copy_data, - const std_cxx1x::function (const Iterator &)> + const std_cxx1x::function (const Iterator &)> &get_conflict_indices, const unsigned int queue_length = 2*multithread_info.n_default_threads, const unsigned int chunk_size = 8)