]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Add a copy constructor in hopes of making Intel's ICC happy.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 30 Sep 2013 14:15:20 +0000 (14:15 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 30 Sep 2013 14:15:20 +0000 (14:15 +0000)
git-svn-id: https://svn.dealii.org/trunk@31036 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/base/work_stream.h

index 21dfb52d09e507ca98711ab7fe47534de06655a1..8a28dd33f4d1b89e5693b18758eb508b429f0a86 100644 (file)
@@ -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 <typename Iterator,
              typename ScratchData,
              typename CopyData>
-               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<std::vector<types::global_dof_index> (const Iterator &)> 
+       const std_cxx1x::function<std::vector<types::global_dof_index> (const Iterator &)>
                                                &get_conflict_indices,
        const unsigned int queue_length = 2*multithread_info.n_default_threads,
        const unsigned int                       chunk_size = 8)

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.