Update clang-format: Cpp11BracedListStyle = true, and enforce O2-wide

Author: davidrohr

.clang-format

@@ -18,7 +18,7 @@ CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 2
-Cpp11BracedListStyle: false
+Cpp11BracedListStyle: true
 DerivePointerBinding: false
 ExperimentalAutoDetectBinPacking: false
 IndentCaseLabels: true

Algorithm/include/Algorithm/HeaderStack.h

@@ -22,9 +22,11 @@
 // is part of the BaseHeader
 #include "Headers/DataHeader.h" // for o2::header::get
 
-namespace o2 {
+namespace o2
+{
 
-namespace algorithm {
+namespace algorithm
+{
 
 /**
  * Generic utility for the O2 header stack, redirect to header specific callbacks
@@ -42,26 +44,24 @@ namespace algorithm {
  *                                 // do something with h
  *                               }
  */
-template<
+template <
   typename PtrType,
   typename SizeType,
   typename HeaderType,
   typename HeaderCallbackType,
-  typename... MoreTypes
-  >
+  typename... MoreTypes>
 void dispatchHeaderStackCallback(PtrType ptr,
                                  SizeType size,
                                  HeaderType header,
                                  HeaderCallbackType onHeader,
                                  MoreTypes&&... types);
 
 // template specialization: handler for one pair of type and callback
-template<
+template <
   typename PtrType,
   typename SizeType,
   typename HeaderType,
-  typename HeaderCallbackType
-  >
+  typename HeaderCallbackType>
 void dispatchHeaderStackCallback(PtrType ptr,
                                  SizeType size,
                                  HeaderType /*dummy*/,
@@ -74,17 +74,18 @@ void dispatchHeaderStackCallback(PtrType ptr,
 }
 
 // an empty function in case no StackTypes have been provided to call
-template<typename PtrType, typename SizeType>
-void dispatchHeaderStackCallback(PtrType ptr, SizeType size) {}
+template <typename PtrType, typename SizeType>
+void dispatchHeaderStackCallback(PtrType ptr, SizeType size)
+{
+}
 
 // actual implementation
-template<
+template <
   typename PtrType,
   typename SizeType,
   typename HeaderType,
   typename HeaderCallbackType,
-  typename... MoreTypes
-  >
+  typename... MoreTypes>
 void dispatchHeaderStackCallback(PtrType ptr,
                                  SizeType size,
                                  HeaderType header,
@@ -113,26 +114,24 @@ void dispatchHeaderStackCallback(PtrType ptr,
  *                    dataheader,
  *                    triggerheader
  */
-template<
+template <
   typename PtrType,
   typename SizeType,
   typename HeaderType,
-  typename... MoreTypes
-  >
+  typename... MoreTypes>
 void parseHeaderStack(PtrType ptr,
                       SizeType size,
-                      HeaderType & header,
+                      HeaderType& header,
                       MoreTypes&&... types);
 
 // template specialization: handler for one type
-template<
+template <
   typename PtrType,
   typename SizeType,
-  typename HeaderType
-  >
+  typename HeaderType>
 void parseHeaderStack(PtrType ptr,
                       SizeType size,
-                      HeaderType & header)
+                      HeaderType& header)
 {
   const HeaderType* h = o2::header::get<HeaderType*>(ptr, size);
   if (h) {
@@ -141,19 +140,20 @@ void parseHeaderStack(PtrType ptr,
 }
 
 // an empty function in case no StackTypes have been provided to call
-template<typename PtrType, typename SizeType>
-void parseHeaderStack(PtrType ptr, SizeType size) {}
+template <typename PtrType, typename SizeType>
+void parseHeaderStack(PtrType ptr, SizeType size)
+{
+}
 
 // generic implementation
-template<
+template <
   typename PtrType,
   typename SizeType,
   typename HeaderType,
-  typename... MoreTypes
-  >
+  typename... MoreTypes>
 void parseHeaderStack(PtrType ptr,
                       SizeType size,
-                      HeaderType & header,
+                      HeaderType& header,
                       MoreTypes&&... types)
 {
   // call for current

Algorithm/include/Algorithm/O2FormatParser.h

@@ -18,9 +18,11 @@
 
 #include "HeaderStack.h"
 
-namespace o2 {
+namespace o2
+{
 
-namespace algorithm {
+namespace algorithm
+{
 
 /**
  * parse an input list and try to interpret in O2 data format
@@ -51,22 +53,18 @@ namespace algorithm {
  *   parseO2Format(list, insertFct, MyHeaderStruct(), onMyHeaderStruct);
  *
  */
-template<
-  typename InputListT
-  , typename GetPointerFctT
-  , typename GetSizeFctT
-  , typename InsertFctT // (const auto&, ptr, size)
-  , typename... HeaderStackTypes // pairs of HeaderType and CallbackType
+template <
+  typename InputListT, typename GetPointerFctT, typename GetSizeFctT, typename InsertFctT, // (const auto&, ptr, size)
+  typename... HeaderStackTypes                                                             // pairs of HeaderType and CallbackType
   >
 int parseO2Format(const InputListT& list,
                   GetPointerFctT getPointer,
                   GetSizeFctT getSize,
                   InsertFctT insert,
-                  HeaderStackTypes&&... stackArgs
-                  )
+                  HeaderStackTypes&&... stackArgs)
 {
   const o2::header::DataHeader* dh = nullptr;
-  for (auto & part : list) {
+  for (auto& part : list) {
     if (!dh) {
       // new header - payload pair, read DataHeader
       dh = o2::header::get<o2::header::DataHeader*>(getPointer(part), getSize(part));
@@ -75,8 +73,7 @@ int parseO2Format(const InputListT& list,
       }
       o2::algorithm::dispatchHeaderStackCallback(getPointer(part),
                                                  getSize(part),
-                                                 stackArgs...
-                                                 );
+                                                 stackArgs...);
     } else {
       insert(*dh, getPointer(part), getSize(part));
       dh = nullptr;
@@ -85,7 +82,7 @@ int parseO2Format(const InputListT& list,
   if (dh) {
     return -ENOMSG;
   }
-  return list.size()/2;
+  return list.size() / 2;
 }
 
 } // namespace algorithm