Add inline keyword

diff --git a/include/deal.II/particles/particle.h b/include/deal.II/particles/particle.h
index 61e1b1724d37aa80eb860c35e733eac989a55309..0cf7d050efe6259fd2c0eccbe904630d0374e33b 100644 (file)
--- a/include/deal.II/particles/particle.h
+++ b/include/deal.II/particles/particle.h
@@ -457,7 +457,7 @@ namespace Particles
 
   template <int dim, int spacedim>
   template <class Archive>
-  void
+  inline void
   Particle<dim, spacedim>::load(Archive &ar, const unsigned int)
   {
     unsigned int n_properties = 0;
@@ -475,7 +475,7 @@ namespace Particles
 
   template <int dim, int spacedim>
   template <class Archive>
-  void
+  inline void
   Particle<dim, spacedim>::save(Archive &ar, const unsigned int) const
   {
     unsigned int n_properties = 0;
@@ -492,7 +492,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   Particle<dim, spacedim>::set_location(const Point<spacedim> &new_loc)
   {
     location = new_loc;
@@ -501,7 +501,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  const Point<spacedim> &
+  inline const Point<spacedim> &
   Particle<dim, spacedim>::get_location() const
   {
     return location;
@@ -510,7 +510,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   Particle<dim, spacedim>::set_reference_location(const Point<dim> &new_loc)
   {
     reference_location = new_loc;
@@ -519,7 +519,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  const Point<dim> &
+  inline const Point<dim> &
   Particle<dim, spacedim>::get_reference_location() const
   {
     return reference_location;
@@ -528,7 +528,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  types::particle_index
+  inline types::particle_index
   Particle<dim, spacedim>::get_id() const
   {
     return id;
@@ -537,7 +537,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   Particle<dim, spacedim>::set_id(const types::particle_index &new_id)
   {
     id = new_id;
@@ -546,7 +546,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   Particle<dim, spacedim>::set_property_pool(PropertyPool &new_property_pool)
   {
     property_pool = &new_property_pool;
@@ -555,7 +555,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  const ArrayView<const double>
+  inline const ArrayView<const double>
   Particle<dim, spacedim>::get_properties() const
   {
     Assert(has_properties(), ExcInternalError());
@@ -566,7 +566,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  bool
+  inline bool
   Particle<dim, spacedim>::has_properties() const
   {
     return (property_pool != nullptr) &&

diff --git a/include/deal.II/particles/particle_accessor.h b/include/deal.II/particles/particle_accessor.h
index 08bddc458644cb9cc3bb87f4d81db7cd718e01ff..2265d10af023e3d2f668de7b91a9b70d6233ed14 100644 (file)
--- a/include/deal.II/particles/particle_accessor.h
+++ b/include/deal.II/particles/particle_accessor.h
@@ -293,8 +293,9 @@ namespace Particles
 
 
   // ------------------------- inline functions ------------------------------
+
   template <int dim, int spacedim>
-  ParticleAccessor<dim, spacedim>::ParticleAccessor()
+  inline ParticleAccessor<dim, spacedim>::ParticleAccessor()
     : map(nullptr)
     , particle()
   {}
@@ -302,7 +303,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  ParticleAccessor<dim, spacedim>::ParticleAccessor(
+  inline ParticleAccessor<dim, spacedim>::ParticleAccessor(
     const std::multimap<internal::LevelInd, Particle<dim, spacedim>> &map,
     const typename std::multimap<internal::LevelInd,
                                  Particle<dim, spacedim>>::iterator & particle)
@@ -314,7 +315,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   ParticleAccessor<dim, spacedim>::write_data(void *&data) const
   {
     Assert(particle != map->end(), ExcInternalError());
@@ -325,7 +326,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   ParticleAccessor<dim, spacedim>::set_location(const Point<spacedim> &new_loc)
   {
     Assert(particle != map->end(), ExcInternalError());
@@ -336,7 +337,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  const Point<spacedim> &
+  inline const Point<spacedim> &
   ParticleAccessor<dim, spacedim>::get_location() const
   {
     Assert(particle != map->end(), ExcInternalError());
@@ -347,7 +348,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   ParticleAccessor<dim, spacedim>::set_reference_location(
     const Point<dim> &new_loc)
   {
@@ -359,7 +360,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  const Point<dim> &
+  inline const Point<dim> &
   ParticleAccessor<dim, spacedim>::get_reference_location() const
   {
     Assert(particle != map->end(), ExcInternalError());
@@ -370,7 +371,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  types::particle_index
+  inline types::particle_index
   ParticleAccessor<dim, spacedim>::get_id() const
   {
     Assert(particle != map->end(), ExcInternalError());
@@ -381,7 +382,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   ParticleAccessor<dim, spacedim>::set_property_pool(
     PropertyPool &new_property_pool)
   {
@@ -393,7 +394,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  bool
+  inline bool
   ParticleAccessor<dim, spacedim>::has_properties() const
   {
     Assert(particle != map->end(), ExcInternalError());
@@ -404,7 +405,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   ParticleAccessor<dim, spacedim>::set_properties(
     const std::vector<double> &new_properties)
   {
@@ -416,7 +417,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   ParticleAccessor<dim, spacedim>::set_properties(
     const ArrayView<const double> &new_properties)
   {
@@ -428,7 +429,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  const ArrayView<const double>
+  inline const ArrayView<const double>
   ParticleAccessor<dim, spacedim>::get_properties() const
   {
     Assert(particle != map->end(), ExcInternalError());
@@ -439,7 +440,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  typename Triangulation<dim, spacedim>::cell_iterator
+  inline typename Triangulation<dim, spacedim>::cell_iterator
   ParticleAccessor<dim, spacedim>::get_surrounding_cell(
     const Triangulation<dim, spacedim> &triangulation) const
   {
@@ -453,7 +454,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  const ArrayView<double>
+  inline const ArrayView<double>
   ParticleAccessor<dim, spacedim>::get_properties()
   {
     Assert(particle != map->end(), ExcInternalError());
@@ -464,7 +465,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  std::size_t
+  inline std::size_t
   ParticleAccessor<dim, spacedim>::serialized_size_in_bytes() const
   {
     Assert(particle != map->end(), ExcInternalError());
@@ -475,7 +476,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   ParticleAccessor<dim, spacedim>::next()
   {
     Assert(particle != map->end(), ExcInternalError());
@@ -485,7 +486,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  void
+  inline void
   ParticleAccessor<dim, spacedim>::prev()
   {
     Assert(particle != map->begin(), ExcInternalError());
@@ -495,7 +496,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  bool
+  inline bool
   ParticleAccessor<dim, spacedim>::
   operator!=(const ParticleAccessor<dim, spacedim> &other) const
   {
@@ -505,7 +506,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  bool
+  inline bool
   ParticleAccessor<dim, spacedim>::
   operator==(const ParticleAccessor<dim, spacedim> &other) const
   {

diff --git a/include/deal.II/particles/particle_iterator.h b/include/deal.II/particles/particle_iterator.h
index 1bb56a2baedc238cbf461b15ba544bec72036bbf..8d2f4f623ab062ccb8ab52d122083350ce4d14ca 100644 (file)
--- a/include/deal.II/particles/particle_iterator.h
+++ b/include/deal.II/particles/particle_iterator.h
@@ -145,7 +145,7 @@ namespace Particles
   // ------------------------------ inline functions -------------------------
 
   template <int dim, int spacedim>
-  ParticleIterator<dim, spacedim>::ParticleIterator(
+  inline ParticleIterator<dim, spacedim>::ParticleIterator(
     const std::multimap<internal::LevelInd, Particle<dim, spacedim>> &map,
     const typename std::multimap<internal::LevelInd,
                                  Particle<dim, spacedim>>::iterator & particle)
@@ -155,7 +155,8 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  ParticleAccessor<dim, spacedim> &ParticleIterator<dim, spacedim>::operator*()
+  inline ParticleAccessor<dim, spacedim> &ParticleIterator<dim, spacedim>::
+                                          operator*()
   {
     return accessor;
   }
@@ -163,7 +164,8 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  ParticleAccessor<dim, spacedim> *ParticleIterator<dim, spacedim>::operator->()
+  inline ParticleAccessor<dim, spacedim> *ParticleIterator<dim, spacedim>::
+                                          operator->()
   {
     return &(this->operator*());
   }
@@ -171,8 +173,8 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  const ParticleAccessor<dim, spacedim> &ParticleIterator<dim, spacedim>::
-                                         operator*() const
+  inline const ParticleAccessor<dim, spacedim> &
+    ParticleIterator<dim, spacedim>::operator*() const
   {
     return accessor;
   }
@@ -180,8 +182,8 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  const ParticleAccessor<dim, spacedim> *ParticleIterator<dim, spacedim>::
-                                         operator->() const
+  inline const ParticleAccessor<dim, spacedim> *
+    ParticleIterator<dim, spacedim>::operator->() const
   {
     return &(this->operator*());
   }
@@ -189,7 +191,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  bool
+  inline bool
   ParticleIterator<dim, spacedim>::
   operator!=(const ParticleIterator<dim, spacedim> &other) const
   {
@@ -199,7 +201,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  bool
+  inline bool
   ParticleIterator<dim, spacedim>::
   operator==(const ParticleIterator<dim, spacedim> &other) const
   {
@@ -209,7 +211,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  ParticleIterator<dim, spacedim> &
+  inline ParticleIterator<dim, spacedim> &
   ParticleIterator<dim, spacedim>::operator++()
   {
     accessor.next();
@@ -219,7 +221,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  ParticleIterator<dim, spacedim>
+  inline ParticleIterator<dim, spacedim>
   ParticleIterator<dim, spacedim>::operator++(int)
   {
     ParticleIterator tmp(*this);
@@ -231,7 +233,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  ParticleIterator<dim, spacedim> &
+  inline ParticleIterator<dim, spacedim> &
   ParticleIterator<dim, spacedim>::operator--()
   {
     accessor.prev();
@@ -241,7 +243,7 @@ namespace Particles
 
 
   template <int dim, int spacedim>
-  ParticleIterator<dim, spacedim>
+  inline ParticleIterator<dim, spacedim>
   ParticleIterator<dim, spacedim>::operator--(int)
   {
     ParticleIterator tmp(*this);