Skip to content

Commit

Permalink
clang-format: unify clang-format configuration, update to c++20
Browse files Browse the repository at this point in the history
  • Loading branch information
tamiko committed Aug 22, 2023
1 parent 0870dea commit 3b3f656
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -175,7 +175,7 @@ SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false

Standard: Cpp11
Standard: c++20

TabWidth: 2

Expand Down
6 changes: 3 additions & 3 deletions examples/.clang-format
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down Expand Up @@ -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
Expand All @@ -103,7 +103,7 @@ SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false

Standard: Cpp11
Standard: c++20

TabWidth: 2

Expand Down

0 comments on commit 3b3f656

Please sign in to comment.