From: Timo Heister <timo.heister@gmail.com>
Date: Thu, 16 May 2019 16:38:53 +0000 (-0600)
Subject: clang-format: do not break @name lines
X-Git-Tag: v9.1.0-rc2~4^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6edeb503d8b595bf7a9b523c0fe6994a28ac78c0;p=dealii.git

clang-format: do not break @name lines

remove hack in scratch_data and add @name to the list of items not to
break automatically.

note: I hate having to fight clang-format.
---

diff --git a/.clang-format b/.clang-format
index dec771995a..0b7a604382 100644
--- a/.clang-format
+++ b/.clang-format
@@ -147,7 +147,7 @@ PenaltyBreakBeforeFirstCallParameter: 90
 PointerAlignment: Right
 
 ReflowComments: true
-CommentPragmas: '( \| |\*--|<li>|@ref | @p | @param  |@returns |@warning |@ingroup |@author |@date |@related |@relates |@relatesalso |@deprecated |@image |@return |@brief |@attention |@copydoc |@addtogroup |@todo |@tparam |@see |@note |@skip |@skipline |@until |@line |@dontinclude |@include)'
+CommentPragmas: '( \| |\*--|<li>|@ref | @p |@param |@name |@returns |@warning |@ingroup |@author |@date |@related |@relates |@relatesalso |@deprecated |@image |@return |@brief |@attention |@copydoc |@addtogroup |@todo |@tparam |@see |@note |@skip |@skipline |@until |@line |@dontinclude |@include)'
 
 SortIncludes: true
 SortUsingDeclarations: true
diff --git a/include/deal.II/meshworker/scratch_data.h b/include/deal.II/meshworker/scratch_data.h
index a59dcbc97b..29826ce2bf 100644
--- a/include/deal.II/meshworker/scratch_data.h
+++ b/include/deal.II/meshworker/scratch_data.h
@@ -502,12 +502,10 @@ namespace MeshWorker
     GeneralDataStorage &
     get_general_data_storage();
 
-    // clang-format off
     /**
      * @name Evaluation of finite element fields and their derivatives on the current cell
      */
     /** @{ */ // CurrentCellEvaluation
-    // clang-format on
 
     /**
      * Extract the local dof values associated with the internally initialized