From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Fri, 25 May 2018 07:48:37 +0000 (+0200)
Subject: Don't break after return types in examples
X-Git-Tag: v9.1.0-rc1~1099^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=098e28bff9074312d064174ae56d50efe76c65b7;p=dealii.git

Don't break after return types in examples
---

diff --git a/examples/.clang-format b/examples/.clang-format
index 7536c1c0d5..cd10459874 100644
--- a/examples/.clang-format
+++ b/examples/.clang-format
@@ -1,6 +1,7 @@
 #
 # The clang-format (Clang 6) style file used by deal.II for the examples.
-# In contrast to the general one, header files are not sorted.
+# In contrast to the general one, header files are not sorted and we do
+# not require return types to be on a separate line.
 #
 
 AccessModifierOffset: -2
@@ -19,7 +20,7 @@ AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 
-AlwaysBreakAfterReturnType: All
+AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true