MemorySpace -> MemorySpaceType

diff --git a/include/deal.II/matrix_free/portable_matrix_free.h b/include/deal.II/matrix_free/portable_matrix_free.h
index bd631563edb079462b451e14ca2aa0eff94330af..e6f96b5d6b8f703ff93629e4f13482cb501dfe38 100644 (file)
--- a/include/deal.II/matrix_free/portable_matrix_free.h
+++ b/include/deal.II/matrix_free/portable_matrix_free.h
@@ -380,10 +380,10 @@ namespace Portable
      * locally owned degrees of freedom and the ghost elements correspond to the
      * (additional) locally relevant dofs.
      */
-    template <typename MemorySpace>
+    template <typename MemorySpaceType>
     void
     initialize_dof_vector(
-      LinearAlgebra::distributed::Vector<Number, MemorySpace> &vec) const;
+      LinearAlgebra::distributed::Vector<Number, MemorySpaceType> &vec) const;
 
     /**
      * Return the colored graph of locally owned active cells.

diff --git a/include/deal.II/matrix_free/portable_matrix_free.templates.h b/include/deal.II/matrix_free/portable_matrix_free.templates.h
index b782081a8ce23919201986caed1f0a0eda72367e..ed94802a6e691e299c939d683714dcc0a2fd48bf 100644 (file)
--- a/include/deal.II/matrix_free/portable_matrix_free.templates.h
+++ b/include/deal.II/matrix_free/portable_matrix_free.templates.h
@@ -566,10 +566,10 @@ namespace Portable
 
 
   template <int dim, typename Number>
-  template <typename MemorySpace>
+  template <typename MemorySpaceType>
   void
   MatrixFree<dim, Number>::initialize_dof_vector(
-    LinearAlgebra::distributed::Vector<Number, MemorySpace> &vec) const
+    LinearAlgebra::distributed::Vector<Number, MemorySpaceType> &vec) const
   {
     if (partitioner)
       vec.reinit(partitioner);

diff --git a/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.cc b/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.cc
index d9389e4ce5d572f2293a42069711e289a4f996fe..6eb2499267e9b40291065cf02bcea45410071254 100644 (file)
--- a/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.cc
+++ b/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.cc
@@ -34,9 +34,9 @@
 #include "../tests.h"
 
 
-template <typename Number, typename MemorySpace>
+template <typename Number, typename MemorySpaceType>
 void
-check(const LinearAlgebra::distributed::Vector<Number, MemorySpace> &vector,
+check(const LinearAlgebra::distributed::Vector<Number, MemorySpaceType> &vector,
       const Utilities::MPI::Partitioner &reference_partitioner)
 {
   Assert(vector.get_partitioner()->locally_owned_range() ==