From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Sun, 22 Jul 2018 15:45:50 +0000 (-0600)
Subject: Match doxygen markup in the .cc file to that in the .h file.
X-Git-Tag: v9.1.0-rc1~902^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d4855ab7f0cc79f8905477aebd5e4fbaabd939;p=dealii.git

Match doxygen markup in the .cc file to that in the .h file.

This is necessary because we run both the .h and the .cc files through doxygen.
If we don't do this, then doxygen will show functions with different markup
twice in the online documentation.
---

diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 188aafd91e..248998f535 100644
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -1860,9 +1860,13 @@ namespace GridTools
 
 
   template <int spacedim>
+#ifndef DOXYGEN
   std::tuple<std::vector<std::vector<unsigned int>>,
              std::map<unsigned int, unsigned int>,
              std::map<unsigned int, std::vector<unsigned int>>>
+#else
+  return_type
+#endif
   guess_point_owner(
     const std::vector<std::vector<BoundingBox<spacedim>>> &global_bboxes,
     const std::vector<Point<spacedim>> &                   points)
@@ -3987,10 +3991,14 @@ namespace GridTools
 
 
   template <int dim, int spacedim>
+#ifndef DOXYGEN
   std::tuple<
     std::vector<typename Triangulation<dim, spacedim>::active_cell_iterator>,
     std::vector<std::vector<Point<dim>>>,
     std::vector<std::vector<unsigned int>>>
+#else
+  return_type
+#endif
   compute_point_locations(
     const Cache<dim, spacedim> &        cache,
     const std::vector<Point<spacedim>> &points,
@@ -4488,12 +4496,16 @@ namespace GridTools
 
 
   template <int dim, int spacedim>
+#ifndef DOXYGEN
   std::tuple<
     std::vector<typename Triangulation<dim, spacedim>::active_cell_iterator>,
     std::vector<std::vector<Point<dim>>>,
     std::vector<std::vector<unsigned int>>,
     std::vector<std::vector<Point<spacedim>>>,
     std::vector<std::vector<unsigned int>>>
+#else
+  return_type
+#endif
   distributed_compute_point_locations(
     const GridTools::Cache<dim, spacedim> &                cache,
     const std::vector<Point<spacedim>> &                   local_points,