Run clang-format

AIDASoft · May 9, 2024 · 3dac52f · 3dac52f
1 parent 97a3f2e
commit 3dac52f
Show file tree

Hide file tree

Showing 49 changed files with 153 additions and 154 deletions.
diff --git a/include/podio/CollectionBufferFactory.h b/include/podio/CollectionBufferFactory.h
@@ -3,9 +3,9 @@
 
 #include <functional>
 #include <optional>
+#include <string>
 #include <unordered_map>
 #include <vector>
-#include <string>
 
 #include "podio/CollectionBuffers.h"
 #include "podio/SchemaEvolution.h"

diff --git a/include/podio/GenericParameters.h b/include/podio/GenericParameters.h
@@ -2,20 +2,20 @@
 #ifndef PODIO_GENERICPARAMETERS_H
 #define PODIO_GENERICPARAMETERS_H 1
 
-#include <stddef.h>
-#include <stdint.h>
 #include <algorithm>
+#include <initializer_list>
 #include <iostream>
+#include <iterator>
 #include <map>
 #include <memory>
 #include <mutex>
+#include <stddef.h>
+#include <stdint.h>
 #include <string>
-#include <vector>
-#include <initializer_list>
-#include <iterator>
 #include <tuple>
 #include <type_traits>
 #include <utility>
+#include <vector>
 
 #include "podio/utilities/TypeHelpers.h"
 

diff --git a/include/podio/RNTupleReader.h b/include/podio/RNTupleReader.h
@@ -3,21 +3,21 @@
 
 #include <ROOT/RNTuple.hxx>
 #include <ROOT/RNTupleModel.hxx>
-#include <RVersion.h>
 #include <ROOT/RVersion.hxx>
+#include <RVersion.h>
+#include <memory>
 #include <string>
 #include <string_view>
 #include <unordered_map>
 #include <vector>
-#include <memory>
 
 #include "podio/CollectionBranches.h"
+#include "podio/GenericParameters.h"
 #include "podio/ICollectionProvider.h"
 #include "podio/ROOTFrameData.h"
 #include "podio/SchemaEvolution.h"
 #include "podio/podioVersion.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
-#include "podio/GenericParameters.h"
 #if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
   #include <ROOT/RNTupleReader.hxx>
 #endif

diff --git a/include/podio/RNTupleWriter.h b/include/podio/RNTupleWriter.h
@@ -3,32 +3,32 @@
 
 #include <ROOT/RNTuple.hxx>
 #include <ROOT/RNTupleModel.hxx>
+#include <ROOT/RVersion.hxx>
 #include <RVersion.h>
 #include <stdint.h>
-#include <ROOT/RVersion.hxx>
 
+#include "TFile.h"
 #include "podio/CollectionBase.h"
 #include "podio/Frame.h"
 #include "podio/GenericParameters.h"
 #include "podio/SchemaEvolution.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
-#include "TFile.h"
 
 namespace ROOT {
 namespace Experimental {
-class REntry;
-}  // namespace Experimental
-}  // namespace ROOT
+  class REntry;
+} // namespace Experimental
+} // namespace ROOT
 #if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
   #include <ROOT/RNTupleWriter.hxx>
 #endif
 
-#include <string>
-#include <unordered_map>
-#include <vector>
 #include <memory>
+#include <string>
 #include <tuple>
+#include <unordered_map>
 #include <utility>
+#include <vector>
 
 namespace podio {
 class Frame;

diff --git a/include/podio/ROOTReader.h b/include/podio/ROOTReader.h
@@ -1,21 +1,21 @@
 #ifndef PODIO_ROOTREADER_H
 #define PODIO_ROOTREADER_H
 
-#include <stddef.h>
 #include <memory>
+#include <stddef.h>
 #include <string>
 #include <string_view>
 #include <tuple>
+#include <unordered_map>
 #include <utility>
 #include <vector>
-#include <unordered_map>
 
+#include "TChain.h"
 #include "podio/CollectionBranches.h"
 #include "podio/ROOTFrameData.h"
+#include "podio/SchemaEvolution.h"
 #include "podio/podioVersion.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
-#include "TChain.h"
-#include "podio/SchemaEvolution.h"
 
 // forward declarations
 class TClass;

diff --git a/include/podio/ROOTWriter.h b/include/podio/ROOTWriter.h
@@ -1,18 +1,18 @@
 #ifndef PODIO_ROOTWRITER_H
 #define PODIO_ROOTWRITER_H
 
-#include <stdint.h>
 #include <memory>
+#include <stdint.h>
 #include <string>
 #include <tuple>
 #include <unordered_map>
-#include <vector>
 #include <utility>
+#include <vector>
 
+#include "TFile.h"
 #include "podio/CollectionBranches.h"
 #include "podio/CollectionIDTable.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
-#include "TFile.h"
 
 // forward declarations
 class TTree;

diff --git a/include/podio/SIOBlock.h b/include/podio/SIOBlock.h
@@ -1,26 +1,26 @@
 #ifndef PODIO_SIOBLOCK_H
 #define PODIO_SIOBLOCK_H
 
+#include <functional>
+#include <map>
+#include <memory>
 #include <podio/CollectionBase.h>
 #include <podio/CollectionIDTable.h>
 #include <podio/GenericParameters.h>
 #include <podio/podioVersion.h>
 #include <podio/utilities/TypeHelpers.h>
 #include <sio/block.h>
+#include <sio/definitions.h>
 #include <sio/io_device.h>
 #include <sio/version.h>
-#include <sio/definitions.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <map>
-#include <memory>
 #include <string>
 #include <string_view>
 #include <tuple>
-#include <vector>
-#include <functional>
 #include <unordered_map>
 #include <utility>
+#include <vector>
 
 #include "podio/CollectionBuffers.h"
 

diff --git a/include/podio/SIOBlockUserData.h b/include/podio/SIOBlockUserData.h
@@ -1,11 +1,11 @@
 #ifndef PODIO_SIOBLOCKUSERDATA_H
 #define PODIO_SIOBLOCKUSERDATA_H
 
+#include <algorithm>
 #include <sio/api.h>
+#include <sio/definitions.h>
 #include <sio/io_device.h>
 #include <sio/version.h>
-#include <sio/definitions.h>
-#include <algorithm>
 #include <string>
 #include <typeindex>
 #include <vector>

diff --git a/include/podio/SIOFrameData.h b/include/podio/SIOFrameData.h
@@ -1,15 +1,15 @@
 #ifndef PODIO_SIOFRAMEDATA_H
 #define PODIO_SIOFRAMEDATA_H
 
-#include <sio/buffer.h>
-#include <sio/definitions.h>
+#include <cstddef>
 #include <memory>
 #include <numeric>
 #include <optional>
+#include <sio/buffer.h>
+#include <sio/definitions.h>
 #include <string>
-#include <vector>
-#include <cstddef>
 #include <utility>
+#include <vector>
 
 #include "podio/CollectionBuffers.h"
 #include "podio/CollectionIDTable.h"

diff --git a/include/podio/SIOLegacyReader.h b/include/podio/SIOLegacyReader.h
@@ -1,13 +1,13 @@
 #ifndef PODIO_SIOLEGACYREADER_H
 #define PODIO_SIOLEGACYREADER_H
 
-#include <sio/definitions.h>
-#include <sio/buffer.h>
+#include <fstream>
 #include <memory>
+#include <sio/buffer.h>
+#include <sio/definitions.h>
+#include <string>
 #include <string_view>
 #include <vector>
-#include <fstream>
-#include <string>
 
 #include "podio/SIOBlock.h"
 #include "podio/SIOFrameData.h"

diff --git a/include/podio/SIOReader.h b/include/podio/SIOReader.h
@@ -1,12 +1,12 @@
 #ifndef PODIO_SIOREADER_H
 #define PODIO_SIOREADER_H
 
-#include <sio/definitions.h>
+#include <fstream>
 #include <memory>
+#include <sio/definitions.h>
 #include <string>
 #include <string_view>
 #include <unordered_map>
-#include <fstream>
 #include <vector>
 
 #include "podio/SIOBlock.h"

diff --git a/include/podio/SIOWriter.h b/include/podio/SIOWriter.h
@@ -1,11 +1,11 @@
 #ifndef PODIO_SIOWRITER_H
 #define PODIO_SIOWRITER_H
 
+#include <fstream>
 #include <sio/definitions.h>
 #include <string>
 #include <utility>
 #include <vector>
-#include <fstream>
 
 #include "podio/SIOBlock.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"

diff --git a/include/podio/SchemaEvolution.h b/include/podio/SchemaEvolution.h
@@ -1,9 +1,9 @@
 #ifndef PODIO_SCHEMAEVOLUTION_H
 #define PODIO_SCHEMAEVOLUTION_H
 
-#include <stddef.h>
 #include <cstdint>
 #include <functional>
+#include <stddef.h>
 #include <string>
 #include <unordered_map>
 #include <vector>

diff --git a/include/podio/UserDataCollection.h b/include/podio/UserDataCollection.h
@@ -1,14 +1,14 @@
 #ifndef PODIO_USERDATACOLLECTION_H
 #define PODIO_USERDATACOLLECTION_H
 
+#include <iostream>
 #include <stddef.h>
 #include <stdint.h>
 #include <string_view>
+#include <tuple>
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include <iostream>
-#include <tuple>
 
 #include "podio/CollectionBase.h"
 #include "podio/CollectionBuffers.h"
@@ -18,7 +18,7 @@
 
 namespace podio {
 class ICollectionProvider;
-}  // namespace podio
+} // namespace podio
 
 #define PODIO_ADD_USER_TYPE(type)                                                                                      \
   template <>                                                                                                          \

diff --git a/podioVersion.in.h b/podioVersion.in.h
@@ -2,8 +2,8 @@
 #define PODIO_PODIOVERSION_H
 
 #include <cstdint>
-#include <sstream>
 #include <ostream>
+#include <sstream>
 #include <tuple>
 #if __cplusplus >= 202002L
   #include <compare>
@@ -13,8 +13,7 @@
 // necessary
 
 /// Define a version to be used in podio.
-#define PODIO_VERSION(major, minor, patch)                                                                             \
-  ((UINT64_C(major) << 32) | (UINT64_C(minor) << 16) | UINT64_C(patch))
+#define PODIO_VERSION(major, minor, patch) ((UINT64_C(major) << 32) | (UINT64_C(minor) << 16) | UINT64_C(patch))
 /// Get the major version from a preprocessor defined version
 #define PODIO_MAJOR_VERSION(v) (((v) & (-1UL >> 16)) >> 32)
 /// Get the minor version from a preprocessor defined version
@@ -23,9 +22,9 @@
 #define PODIO_PATCH_VERSION(v) ((v) & (-1UL >> 48))
 
 // Some helper constants that are populated by the cmake configure step
-#define podio_VERSION_MAJOR @podio_VERSION_MAJOR@
-#define podio_VERSION_MINOR @podio_VERSION_MINOR@
-#define podio_VERSION_PATCH @podio_VERSION_PATCH@
+#define podio_VERSION_MAJOR @podio_VERSION_MAJOR @
+#define podio_VERSION_MINOR @podio_VERSION_MINOR @
+#define podio_VERSION_PATCH @podio_VERSION_PATCH @
 #define podio_VERSION PODIO_VERSION(podio_VERSION_MAJOR, podio_VERSION_MINOR, podio_VERSION_PATCH)
 
 /// The encoded version with which podio has been built
@@ -42,7 +41,7 @@ struct Version {
   uint16_t patch{0};
 
 #if __cplusplus >= 202002L
-  auto operator<=>(const Version&) const = default;
+  auto operator<= > (const Version&) const = default;
 #else
   // No spaceship yet in c++17
   #define DEFINE_COMP_OPERATOR(OP)                                                                                     \

diff --git a/src/CollectionIDTable.cc b/src/CollectionIDTable.cc
@@ -1,10 +1,10 @@
 // podio specific includes
 #include "podio/CollectionIDTable.h"
 
-#include <stddef.h>
 #include <algorithm>
 #include <iostream>
 #include <iterator>
+#include <stddef.h>
 #include <utility>
 
 #include "MurmurHash3.h"

diff --git a/src/RNTupleReader.cc b/src/RNTupleReader.cc
@@ -1,17 +1,17 @@
 #include "podio/RNTupleReader.h"
 
-#include <ROOT/RError.hxx>
-#include <stddef.h>
-#include <stdint.h>
 #include <ROOT/REntry.hxx>
+#include <ROOT/RError.hxx>
 #include <ROOT/RNTupleModel.hxx>
 #include <ROOT/RNTupleView.hxx>
-#include <memory>
 #include <algorithm>
 #include <format>
 #include <iostream>
+#include <memory>
 #include <numeric>
 #include <optional>
+#include <stddef.h>
+#include <stdint.h>
 #include <tuple>
 #include <utility>
 
@@ -20,8 +20,8 @@
 #include "podio/CollectionIDTable.h"
 #include "podio/DatamodelRegistry.h"
 #include "podio/GenericParameters.h"
-#include "rootUtils.h"
 #include "podio/ObjectID.h"
+#include "rootUtils.h"
 
 namespace podio {