clang-format: unify clang-format configuration, update to c++20

diff --git a/.clang-format b/.clang-format
index 2975f20f50074d4e06b633b385b715d0841d9ece..aa1f77a7e59f55b05e95dd427d0a83428d101d15 100644 (file)
--- 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 87b185e3443367e7f51882a1e231f1804b6a4c18..1d3b95af1b7f872c2669afa32df013bd3c436e16 100644 (file)
--- 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: '( \| |\*--|<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|@sect1|@sect2|@sect3|@sect4)'
+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|@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