Allow for braced initialization in astyle.rc

diff --git a/contrib/styles/astyle.rc b/contrib/styles/astyle.rc
index 91c5c9221cae6036a186303e304fad30403fceb3..86650e7db1bdfcc295796568faef856b5983c798 100644 (file)
--- 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 19ae7b02a46fa9d8cbbcb8f8043b8438631de1d0..e8337b898519e8c2f124d0dbc99919f72d086211 100644 (file)
--- 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;