From: Konrad Simon <konrad.simon@uni-hamburg.de>
Date: Fri, 13 Aug 2021 18:53:02 +0000 (+0200)
Subject: fix clang-format version to 11.1
X-Git-Tag: v9.4.0-rc1~1084^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F12650%2Fhead;p=dealii.git

fix clang-format version to 11.1
---

diff --git a/.clang-format b/.clang-format
index 795ee2c028..b410a5e448 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,5 @@
 #
-# The clang-format (Clang 6) style file used by deal.II.
+# The clang-format (Clang 11) style file used by deal.II.
 #
 
 AccessModifierOffset: -2
diff --git a/bundled/.clang-format b/bundled/.clang-format
index 184bb9fa58..52d3a671ce 100644
--- a/bundled/.clang-format
+++ b/bundled/.clang-format
@@ -1,5 +1,5 @@
 #
-# The clang-format (Clang 6) style file used by deal.II.
+# The clang-format (Clang 11) style file used by deal.II.
 # This directory shall not be formatted.
 #
 
diff --git a/contrib/utilities/indent.py b/contrib/utilities/indent.py
index 5e6c4b48c1..7b28eba164 100644
--- a/contrib/utilities/indent.py
+++ b/contrib/utilities/indent.py
@@ -92,7 +92,7 @@ def parse_arguments():
                                      "in a list of directories "
                                      "that satisfy a given regex."
                                      "This program requires "
-                                     "clang-format version 6.0.0 or 6.0.1.")
+                                     "clang-format version 11.1.")
 
     parser.add_argument("-b", "--clang-format-binary", metavar="PATH",
                         default=distutils.spawn.find_executable("clang-format"))
diff --git a/doc/.clang-format b/doc/.clang-format
index 184bb9fa58..52d3a671ce 100644
--- a/doc/.clang-format
+++ b/doc/.clang-format
@@ -1,5 +1,5 @@
 #
-# The clang-format (Clang 6) style file used by deal.II.
+# The clang-format (Clang 11) style file used by deal.II.
 # This directory shall not be formatted.
 #
 
diff --git a/doc/doxygen/headers/coding_conventions.h b/doc/doxygen/headers/coding_conventions.h
index 11af41c7e6..c7a22bc8d0 100644
--- a/doc/doxygen/headers/coding_conventions.h
+++ b/doc/doxygen/headers/coding_conventions.h
@@ -32,7 +32,7 @@ code is written, without having to look up the exact definition of something.
 
 <h3>Notes on deal.II indentation</h3>
 
-<p>deal.II uses <code>clang-format</code> 6.0 to normalize indentation. A
+<p>deal.II uses <code>clang-format</code> 11.1 to normalize indentation. A
 style file is provided at
 @code
   \${SOURCE_DIR}/.clang-format
@@ -61,7 +61,7 @@ If the system you are working on has more than one version of
 <code>clang-format</code> installed (or if it is not in the path)
 you should replace the above <code>make indent</code> command with
 @code
-  make DEAL_II_CLANG_FORMAT=/path/to/clang-6.0/clang-format indent
+  make DEAL_II_CLANG_FORMAT=/path/to/clang-11.1/clang-format indent
 @endcode
 to point to the correct executable.
 </p>
diff --git a/examples/.clang-format b/examples/.clang-format
index a640fbdc74..87b185e344 100644
--- a/examples/.clang-format
+++ b/examples/.clang-format
@@ -1,5 +1,5 @@
 #
-# The clang-format (Clang 6) style file used by deal.II for the examples.
+# The clang-format (Clang 11) 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.
 #