Skip to content

Commit

Permalink
Merge pull request #15925 from masterleinad/use_qualifier_alignment_left
Browse files Browse the repository at this point in the history
clang-format: Use QualifierAlignment: Left
  • Loading branch information
bangerth committed Aug 24, 2023
2 parents 26c7c44 + 00eae9c commit 0debd01
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ PointerAlignment: Right
ReflowComments: true
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)'

QualifierAlignment: Left

SortIncludes: true
SortUsingDeclarations: true

Expand Down
4 changes: 2 additions & 2 deletions cmake/scripts/expand_instantiations.cc
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ delete_empty_entries(const std::list<std::string> &list)
// determine whether a given substring at position #pos and length #length
// in the string #text is a real token, i.e. not just part of another word
bool
is_real_token(const std::string & text,
is_real_token(const std::string &text,
const std::string::size_type pos,
const std::string::size_type length)
{
Expand Down Expand Up @@ -362,7 +362,7 @@ read_expansion_lists(const std::string &filename)
// produce all combinations of substitutions of the tokens given in the
// #substitutions list in #text and output it to std::cout
void
substitute(const std::string & text,
substitute(const std::string &text,
const std::list<std::pair<std::string, std::string>> &substitutions)
{
// do things recursively: if the list of substitutions has a single
Expand Down
2 changes: 2 additions & 0 deletions examples/.clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ PenaltyBreakBeforeFirstCallParameter: 90

PointerAlignment: Right

QualifierAlignment: Left

ReflowComments: true
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)'

Expand Down

0 comments on commit 0debd01

Please sign in to comment.