From: Daniel Arndt <arndtd@ornl.gov>
Date: Fri, 10 Jan 2020 22:13:12 +0000 (-0500)
Subject: Revert classes without copy constructor
X-Git-Tag: v9.2.0-rc1~661^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9249%2Fhead;p=dealii.git

Revert classes without copy constructor
---

diff --git a/include/deal.II/base/flow_function.h b/include/deal.II/base/flow_function.h
index 9696784f33..8486837f4d 100644
--- a/include/deal.II/base/flow_function.h
+++ b/include/deal.II/base/flow_function.h
@@ -128,7 +128,7 @@ namespace Functions
     /**
      * A mutex that guards the following scratch arrays.
      */
-    mutable std::mutex mutex;
+    mutable Threads::Mutex mutex;
 
     /**
      * Auxiliary values for the usual Function interface.
diff --git a/include/deal.II/base/function_cspline.h b/include/deal.II/base/function_cspline.h
index febff9b51b..c058669c9e 100644
--- a/include/deal.II/base/function_cspline.h
+++ b/include/deal.II/base/function_cspline.h
@@ -132,7 +132,7 @@ namespace Functions
     /**
      * A mutex for accelerator object.
      */
-    mutable std::mutex acc_mutex;
+    mutable Threads::Mutex acc_mutex;
   };
 } // namespace Functions
 
diff --git a/include/deal.II/base/incremental_function.h b/include/deal.II/base/incremental_function.h
index 0680249175..dfb8a6e43f 100644
--- a/include/deal.II/base/incremental_function.h
+++ b/include/deal.II/base/incremental_function.h
@@ -120,7 +120,7 @@ namespace Functions
     /**
      * Thread mutex for supporting evaluation in multi-threaded contexts.
      */
-    mutable std::mutex mutex;
+    mutable Threads::Mutex mutex;
   };
 
 } // namespace Functions
diff --git a/include/deal.II/base/timer.h b/include/deal.II/base/timer.h
index 8b6b74d908..fdc03bb4f8 100644
--- a/include/deal.II/base/timer.h
+++ b/include/deal.II/base/timer.h
@@ -911,7 +911,7 @@ private:
    * A lock that makes sure that this class gives reasonable results even when
    * used with several threads.
    */
-  std::mutex mutex;
+  Threads::Mutex mutex;
 };
 
 
diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h
index 8cec8ab34c..c07f1b2b71 100644
--- a/include/deal.II/fe/fe_system.h
+++ b/include/deal.II/fe/fe_system.h
@@ -529,7 +529,7 @@ public:
   /**
    * Move constructor.
    */
-  FESystem(FESystem<dim, spacedim> &&other_fe_system)
+  FESystem(FESystem<dim, spacedim> &&other_fe_system) noexcept
     : FiniteElement<dim, spacedim>(std::move(other_fe_system))
   {
     base_elements = std::move(other_fe_system.base_elements);
diff --git a/include/deal.II/fe/mapping_q_eulerian.h b/include/deal.II/fe/mapping_q_eulerian.h
index 670a4d89f3..bd6ce6b776 100644
--- a/include/deal.II/fe/mapping_q_eulerian.h
+++ b/include/deal.II/fe/mapping_q_eulerian.h
@@ -266,7 +266,7 @@ private:
     /**
      * A variable to guard access to the fe_values variable.
      */
-    mutable std::mutex fe_values_mutex;
+    mutable Threads::Mutex fe_values_mutex;
   };
 };
 
diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h
index a02eacb1d7..185a7dce5c 100644
--- a/include/deal.II/lac/precondition.h
+++ b/include/deal.II/lac/precondition.h
@@ -1210,7 +1210,7 @@ private:
    * A mutex to avoid that multiple vmult() invocations by different threads
    * overwrite the temporary vectors.
    */
-  mutable std::mutex mutex;
+  mutable Threads::Mutex mutex;
 
   /**
    * Initializes the factors theta and delta based on an eigenvalue
diff --git a/include/deal.II/lac/scalapack.h b/include/deal.II/lac/scalapack.h
index 50df0d3b92..8579222321 100644
--- a/include/deal.II/lac/scalapack.h
+++ b/include/deal.II/lac/scalapack.h
@@ -985,7 +985,7 @@ private:
   /**
    * Thread mutex.
    */
-  mutable std::mutex mutex;
+  mutable Threads::Mutex mutex;
 };
 
 // ----------------------- inline functions ----------------------------
diff --git a/include/deal.II/lac/vector_memory.h b/include/deal.II/lac/vector_memory.h
index cc721bde3a..eabcada252 100644
--- a/include/deal.II/lac/vector_memory.h
+++ b/include/deal.II/lac/vector_memory.h
@@ -462,7 +462,7 @@ private:
    * Mutex to synchronize access to internal data of this object from multiple
    * threads.
    */
-  static std::mutex mutex;
+  static Threads::Mutex mutex;
 };
 
 
diff --git a/include/deal.II/lac/vector_memory.templates.h b/include/deal.II/lac/vector_memory.templates.h
index beb406df72..f9081291c7 100644
--- a/include/deal.II/lac/vector_memory.templates.h
+++ b/include/deal.II/lac/vector_memory.templates.h
@@ -38,7 +38,7 @@ GrowingVectorMemory<VectorType>::get_pool()
 
 
 template <typename VectorType>
-std::mutex GrowingVectorMemory<VectorType>::mutex;
+Threads::Mutex GrowingVectorMemory<VectorType>::mutex;