]> https://gitweb.dealii.org/ - dealii.git/commitdiff
fix matrix free compilation 4026/head
authorTimo Heister <timo.heister@gmail.com>
Sat, 4 Mar 2017 13:19:34 +0000 (08:19 -0500)
committerTimo Heister <timo.heister@gmail.com>
Sat, 4 Mar 2017 13:19:34 +0000 (08:19 -0500)
MSVC complains

include/deal.II/matrix_free/operators.h

index 2cf53e665f5108bb697f704f8dde8531f6ed469f..095319bc1af80114f1c2cac2f74935be25df23d9 100644 (file)
@@ -767,7 +767,7 @@ namespace MatrixFreeOperators
   template <int dim, typename VectorType>
   void
   Base<dim,VectorType>::
-  initialize (std_cxx11::shared_ptr<const MatrixFree<dim,Base<dim,VectorType>::value_type> > data_)
+  initialize (std_cxx11::shared_ptr<const MatrixFree<dim,typename Base<dim,VectorType>::value_type> > data_)
   {
     data = data_;
     edge_constrained_indices.clear();
@@ -779,7 +779,7 @@ namespace MatrixFreeOperators
   template <int dim, typename VectorType>
   void
   Base<dim,VectorType>::
-  initialize (std_cxx11::shared_ptr<const MatrixFree<dim,Base<dim,VectorType>::value_type> > data_,
+  initialize (std_cxx11::shared_ptr<const MatrixFree<dim,typename Base<dim,VectorType>::value_type> > data_,
               const MGConstrainedDoFs      &mg_constrained_dofs,
               const unsigned int            level)
   {
@@ -1252,7 +1252,7 @@ namespace MatrixFreeOperators
 
 
   template <int dim, int fe_degree, int n_q_points_1d, int n_components, typename VectorType>
-  std_cxx11::shared_ptr< Table<2, VectorizedArray<typename Base<dim,VectorType>::value_type> > >
+  std_cxx11::shared_ptr< Table<2, VectorizedArray< typename LaplaceOperator<dim, fe_degree, n_q_points_1d, n_components, VectorType>::value_type> > >
   LaplaceOperator<dim, fe_degree, n_q_points_1d, n_components, VectorType>::
   get_coefficient()
   {

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.