From a94f96e3737e887ef762137d90ac1497268ffb82 Mon Sep 17 00:00:00 2001
From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Sat, 12 Jan 2019 15:15:25 +0100
Subject: [PATCH] Actually delete copy constructors for FEValues*

---
 include/deal.II/fe/fe_values.h | 28 ++++++++++-----------
 source/fe/fe_values.cc         | 45 ----------------------------------
 2 files changed, 13 insertions(+), 60 deletions(-)

diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h
index e0f09e6a50..724506943b 100644
--- a/include/deal.II/fe/fe_values.h
+++ b/include/deal.II/fe/fe_values.h
@@ -261,10 +261,10 @@ namespace FEValuesViews
 
     /**
      * Copy operator. This is not a lightweight object so we don't allow
-     * copying and generate an exception if this function is called.
+     * copying and generate a compile-time error if this function is called.
      */
     Scalar &
-    operator=(const Scalar<dim, spacedim> &);
+    operator=(const Scalar<dim, spacedim> &) = delete;
 
     /**
      * Return the value of the vector component selected by this view, for the
@@ -767,10 +767,10 @@ namespace FEValuesViews
 
     /**
      * Copy operator. This is not a lightweight object so we don't allow
-     * copying and generate an exception if this function is called.
+     * copying and generate a compile-time error if this function is called.
      */
     Vector &
-    operator=(const Vector<dim, spacedim> &);
+    operator=(const Vector<dim, spacedim> &) = delete;
 
     /**
      * Return the value of the vector components selected by this view, for
@@ -1363,10 +1363,10 @@ namespace FEValuesViews
 
     /**
      * Copy operator. This is not a lightweight object so we don't allow
-     * copying and generate an exception if this function is called.
+     * copying and generate a compile-time error if this function is called.
      */
     SymmetricTensor &
-    operator=(const SymmetricTensor<2, dim, spacedim> &);
+    operator=(const SymmetricTensor<2, dim, spacedim> &) = delete;
 
     /**
      * Return the value of the vector components selected by this view, for
@@ -1659,10 +1659,10 @@ namespace FEValuesViews
 
     /**
      * Copy operator. This is not a lightweight object so we don't allow
-     * copying and generate an exception if this function is called.
+     * copying and generate a compile-time error if this function is called.
      */
     Tensor &
-    operator=(const Tensor<2, dim, spacedim> &);
+    operator=(const Tensor<2, dim, spacedim> &) = delete;
 
     /**
      * Return the value of the vector components selected by this view, for
@@ -2045,6 +2045,11 @@ public:
                const Mapping<dim, spacedim> &      mapping,
                const FiniteElement<dim, spacedim> &fe);
 
+  /**
+   * The copy operator is deleted since objects of this class are not copyable.
+   */
+  FEValuesBase &
+  operator=(const FEValuesBase &) = delete;
 
   /**
    * Destructor.
@@ -3392,13 +3397,6 @@ private:
    */
   FEValuesBase(const FEValuesBase &);
 
-  /**
-   * Copy operator. Since objects of this class are not copyable, we make it
-   * private, and also do not implement it.
-   */
-  FEValuesBase &
-  operator=(const FEValuesBase &);
-
   /**
    * A cache for all possible FEValuesViews objects.
    */
diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc
index 0f682e841d..b432ec9155 100644
--- a/source/fe/fe_values.cc
+++ b/source/fe/fe_values.cc
@@ -183,17 +183,6 @@ namespace FEValuesViews
 
 
 
-  template <int dim, int spacedim>
-  Scalar<dim, spacedim> &
-  Scalar<dim, spacedim>::operator=(const Scalar<dim, spacedim> &)
-  {
-    // we shouldn't be copying these objects
-    Assert(false, ExcInternalError());
-    return *this;
-  }
-
-
-
   template <int dim, int spacedim>
   Vector<dim, spacedim>::Vector(const FEValuesBase<dim, spacedim> &fe_values,
                                 const unsigned int first_vector_component)
@@ -275,17 +264,6 @@ namespace FEValuesViews
 
 
 
-  template <int dim, int spacedim>
-  Vector<dim, spacedim> &
-  Vector<dim, spacedim>::operator=(const Vector<dim, spacedim> &)
-  {
-    // we shouldn't be copying these objects
-    Assert(false, ExcInternalError());
-    return *this;
-  }
-
-
-
   template <int dim, int spacedim>
   SymmetricTensor<2, dim, spacedim>::SymmetricTensor(
     const FEValuesBase<dim, spacedim> &fe_values,
@@ -376,18 +354,6 @@ namespace FEValuesViews
 
 
 
-  template <int dim, int spacedim>
-  SymmetricTensor<2, dim, spacedim> &
-  SymmetricTensor<2, dim, spacedim>::
-  operator=(const SymmetricTensor<2, dim, spacedim> &)
-  {
-    // we shouldn't be copying these objects
-    Assert(false, ExcInternalError());
-    return *this;
-  }
-
-
-
   template <int dim, int spacedim>
   Tensor<2, dim, spacedim>::Tensor(const FEValuesBase<dim, spacedim> &fe_values,
                                    const unsigned int first_tensor_component)
@@ -468,17 +434,6 @@ namespace FEValuesViews
 
 
 
-  template <int dim, int spacedim>
-  Tensor<2, dim, spacedim> &
-  Tensor<2, dim, spacedim>::operator=(const Tensor<2, dim, spacedim> &)
-  {
-    // we shouldn't be copying these objects
-    Assert(false, ExcInternalError());
-    return *this;
-  }
-
-
-
   namespace internal
   {
     // Given values of degrees of freedom, evaluate the
-- 
2.39.5