From 6edeb503d8b595bf7a9b523c0fe6994a28ac78c0 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 16 May 2019 10:38:53 -0600 Subject: [PATCH] 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. --- .clang-format | 2 +- include/deal.II/meshworker/scratch_data.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) 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: '( \| |\*--|
  • |@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: '( \| |\*--|
  • |@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 -- 2.39.5