From: Bruno Turcksin <bruno.turcksin@gmail.com>
Date: Thu, 19 Sep 2019 20:33:31 +0000 (+0000)
Subject: Inline functions because of bugs in hipcc
X-Git-Tag: v9.2.0-rc1~1043^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=673e42e0f30aeb6428d4c766a744312d5227f082;p=dealii.git

Inline functions because of bugs in hipcc
---

diff --git a/include/deal.II/hp/dof_faces.h b/include/deal.II/hp/dof_faces.h
index 5a480677d5..286f2bad4f 100644
--- a/include/deal.II/hp/dof_faces.h
+++ b/include/deal.II/hp/dof_faces.h
@@ -343,6 +343,15 @@ namespace internal
     {}
 
 
+
+    inline std::size_t
+    DoFIndicesOnFaces<1>::memory_consumption() const
+    {
+      return 0;
+    }
+
+
+
     template <class Archive>
     void
     DoFIndicesOnFaces<2>::serialize(Archive &ar, const unsigned int)
@@ -351,6 +360,15 @@ namespace internal
     }
 
 
+
+    inline std::size_t
+    DoFIndicesOnFaces<2>::memory_consumption() const
+    {
+      return MemoryConsumption::memory_consumption(lines);
+    }
+
+
+
     template <class Archive>
     void
     DoFIndicesOnFaces<3>::serialize(Archive &ar, const unsigned int)
@@ -358,6 +376,15 @@ namespace internal
       ar &lines &quads;
     }
 
+
+
+    inline std::size_t
+    DoFIndicesOnFaces<3>::memory_consumption() const
+    {
+      return (MemoryConsumption::memory_consumption(lines) +
+              MemoryConsumption::memory_consumption(quads));
+    }
+
     template <int structdim>
     template <int dim, int spacedim>
     inline types::global_dof_index
diff --git a/include/deal.II/hp/dof_handler.h b/include/deal.II/hp/dof_handler.h
index d6c9b0888f..e4850d9fd1 100644
--- a/include/deal.II/hp/dof_handler.h
+++ b/include/deal.II/hp/dof_handler.h
@@ -1405,6 +1405,38 @@ namespace hp
     // then just hand everything over to the other function that does the work
     return n_boundary_dofs(boundary_ids_only);
   }
+
+
+
+  template <>
+  inline types::global_dof_index
+  DoFHandler<2, 3>::n_boundary_dofs() const
+  {
+    Assert(false, ExcNotImplemented());
+    return 0;
+  }
+
+
+
+  template <>
+  template <typename number>
+  inline types::global_dof_index
+  DoFHandler<2, 3>::n_boundary_dofs(
+    const std::map<types::boundary_id, const Function<3, number> *> &) const
+  {
+    Assert(false, ExcNotImplemented());
+    return 0;
+  }
+
+
+
+  template <>
+  inline types::global_dof_index
+  DoFHandler<2, 3>::n_boundary_dofs(const std::set<types::boundary_id> &) const
+  {
+    Assert(false, ExcNotImplemented());
+    return 0;
+  }
 }
 
 
diff --git a/source/hp/dof_faces.cc b/source/hp/dof_faces.cc
index 8ee804f58a..fd9bb1d7cf 100644
--- a/source/hp/dof_faces.cc
+++ b/source/hp/dof_faces.cc
@@ -43,33 +43,6 @@ namespace internal
 
     template std::size_t
     DoFIndicesOnFacesOrEdges<3>::memory_consumption() const;
-
-
-    // ---------------------- DoFFaces ----------------------------
-
-    std::size_t
-    DoFIndicesOnFaces<1>::memory_consumption() const
-    {
-      return 0;
-    }
-
-
-
-    std::size_t
-    DoFIndicesOnFaces<2>::memory_consumption() const
-    {
-      return MemoryConsumption::memory_consumption(lines);
-    }
-
-
-
-    std::size_t
-    DoFIndicesOnFaces<3>::memory_consumption() const
-    {
-      return (MemoryConsumption::memory_consumption(lines) +
-              MemoryConsumption::memory_consumption(quads));
-    }
-
   } // namespace hp
 } // namespace internal
 
diff --git a/source/hp/dof_handler.cc b/source/hp/dof_handler.cc
index db2a329660..947e0ec817 100644
--- a/source/hp/dof_handler.cc
+++ b/source/hp/dof_handler.cc
@@ -1498,38 +1498,6 @@ namespace hp
 
 
 
-  template <>
-  types::global_dof_index
-  DoFHandler<2, 3>::n_boundary_dofs() const
-  {
-    Assert(false, ExcNotImplemented());
-    return 0;
-  }
-
-
-
-  template <>
-  template <typename number>
-  types::global_dof_index
-  DoFHandler<2, 3>::n_boundary_dofs(
-    const std::map<types::boundary_id, const Function<3, number> *> &) const
-  {
-    Assert(false, ExcNotImplemented());
-    return 0;
-  }
-
-
-
-  template <>
-  types::global_dof_index
-  DoFHandler<2, 3>::n_boundary_dofs(const std::set<types::boundary_id> &) const
-  {
-    Assert(false, ExcNotImplemented());
-    return 0;
-  }
-
-
-
   template <int dim, int spacedim>
   std::size_t
   DoFHandler<dim, spacedim>::memory_consumption() const