From a9f8890c80f065b16f099b26e294dab37c49e2cf Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 21 Aug 2023 22:35:29 -0500 Subject: [PATCH] clang-format: unify clang-format configuration, update to c++20 --- .clang-format | 4 ++-- examples/.clang-format | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.clang-format b/.clang-format index 2975f20f50..aa1f77a7e5 100644 --- a/.clang-format +++ b/.clang-format @@ -1,5 +1,5 @@ # -# The clang-format (Clang 11) style file used by deal.II. +# The clang-format (Clang 16) style file used by deal.II. # AccessModifierOffset: -2 @@ -175,7 +175,7 @@ SpacesInContainerLiterals: false SpacesInParentheses: false SpacesInSquareBrackets: false -Standard: Cpp11 +Standard: c++20 TabWidth: 2 diff --git a/examples/.clang-format b/examples/.clang-format index 87b185e344..1d3b95af1b 100644 --- a/examples/.clang-format +++ b/examples/.clang-format @@ -1,5 +1,5 @@ # -# The clang-format (Clang 11) style file used by deal.II for the examples. +# The clang-format (Clang 16) style file used by deal.II for the examples. # In contrast to the general one, header files are not sorted and we do # not require return types to be on a separate line. # @@ -86,7 +86,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|@sect1|@sect2|@sect3|@sect4)' +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|@sect1|@sect2|@sect3|@sect4)' SortIncludes: false SortUsingDeclarations: true @@ -103,7 +103,7 @@ SpacesInContainerLiterals: false SpacesInParentheses: false SpacesInSquareBrackets: false -Standard: Cpp11 +Standard: c++20 TabWidth: 2 -- 2.39.5