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 5a480677d5b5dc8fce8d21ffb4bc02dabbfe8be8..286f2bad4fed97267fa6b89fc9d5c646fb17222d 100644 (file)
--- 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 d6c9b0888f66914fe4e604cdd0144c5d8300d761..e4850d9fd1b28d2fed08adddbc98c622ecd77687 100644 (file)
--- 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 8ee804f58a72d0c8d468d35c44e546dbca93cb13..fd9bb1d7cf76671a1fffec498ec4fad3adb6cc4b 100644 (file)
--- 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 db2a3296607b79b58cd1088a59f379e3ea7d7760..947e0ec8177ee5986727551a981dc17dbb12b506 100644 (file)
--- 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