Fix copy operator for different argument types. This wasn't

instantiable before.

git-svn-id: https://svn.dealii.org/trunk@7596 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/base/include/base/table.h b/deal.II/base/include/base/table.h
index 144c404d6956cf4a099c33c6d64c0bdbf1d13ab8..38d6c8a4c873217f3b6ade893b7e91009e142fc0 100644 (file)
--- a/deal.II/base/include/base/table.h
+++ b/deal.II/base/include/base/table.h
@@ -929,6 +929,12 @@ class TableBase : public Subscriptor
                                       * table.
                                       */
     TableIndices<N> table_size;
+
+                                    /**
+                                     * Make all other table classes
+                                     * friends.
+                                     */
+    template <int, typename> friend class TableBase;
 };
 
 

diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h
index 67c6f86cef44cb69b522521e7e5e0d9a5f3b7c9f..95a6e8c3a4ae046f0c9d2b8f62cf14950535bd7f 100644 (file)
--- a/deal.II/lac/include/lac/full_matrix.templates.h
+++ b/deal.II/lac/include/lac/full_matrix.templates.h
@@ -70,7 +70,7 @@ template <typename number2>
 FullMatrix<number>&
 FullMatrix<number>::operator = (const FullMatrix<number2>& M)
 {
-  Table<2,number>::operator=(M);
+  TableBase<2,number>::operator=(M);
   return *this;
 }