From: Daniel Arndt Date: Tue, 6 Feb 2018 21:28:37 +0000 (+0100) Subject: Allow for braced initialization in astyle.rc X-Git-Tag: v9.0.0-rc1~462^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f294077b7c7d50c1fba9c5018ff7adb5e6011b33;p=dealii.git Allow for braced initialization in astyle.rc --- diff --git a/contrib/styles/astyle.rc b/contrib/styles/astyle.rc index 91c5c9221c..86650e7db1 100644 --- a/contrib/styles/astyle.rc +++ b/contrib/styles/astyle.rc @@ -21,6 +21,7 @@ --indent-preprocessor --indent=spaces=2 --indent-namespaces +--keep-one-line-blocks --min-conditional-indent=0 --pad-header diff --git a/source/dummy.cc b/source/dummy.cc index 19ae7b02a4..e8337b8985 100644 --- a/source/dummy.cc +++ b/source/dummy.cc @@ -20,7 +20,7 @@ * the generated Xcode project. */ -const int global_symbol_42 = 42; +const int global_symbol_42 {42}; void use_global_symbol_42() { (void) global_symbol_42;