Skip to content

Commit 3dac52f

Browse files
jmcarcelljmcarcell
committed
Run clang-format
1 parent 97a3f2e commit 3dac52f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+153
-154
lines changed

‎include/podio/CollectionBufferFactory.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
#include <functional>
55
#include <optional>
6+
#include <string>
67
#include <unordered_map>
78
#include <vector>
8-
#include <string>
99

1010
#include "podio/CollectionBuffers.h"
1111
#include "podio/SchemaEvolution.h"

‎include/podio/GenericParameters.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
#ifndef PODIO_GENERICPARAMETERS_H
33
#define PODIO_GENERICPARAMETERS_H 1
44

5-
#include <stddef.h>
6-
#include <stdint.h>
75
#include <algorithm>
6+
#include <initializer_list>
87
#include <iostream>
8+
#include <iterator>
99
#include <map>
1010
#include <memory>
1111
#include <mutex>
12+
#include <stddef.h>
13+
#include <stdint.h>
1214
#include <string>
13-
#include <vector>
14-
#include <initializer_list>
15-
#include <iterator>
1615
#include <tuple>
1716
#include <type_traits>
1817
#include <utility>
18+
#include <vector>
1919

2020
#include "podio/utilities/TypeHelpers.h"
2121

‎include/podio/RNTupleReader.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33

44
#include <ROOT/RNTuple.hxx>
55
#include <ROOT/RNTupleModel.hxx>
6-
#include <RVersion.h>
76
#include <ROOT/RVersion.hxx>
7+
#include <RVersion.h>
8+
#include <memory>
89
#include <string>
910
#include <string_view>
1011
#include <unordered_map>
1112
#include <vector>
12-
#include <memory>
1313

1414
#include "podio/CollectionBranches.h"
15+
#include "podio/GenericParameters.h"
1516
#include "podio/ICollectionProvider.h"
1617
#include "podio/ROOTFrameData.h"
1718
#include "podio/SchemaEvolution.h"
1819
#include "podio/podioVersion.h"
1920
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
20-
#include "podio/GenericParameters.h"
2121
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
2222
#include <ROOT/RNTupleReader.hxx>
2323
#endif

‎include/podio/RNTupleWriter.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@
33

44
#include <ROOT/RNTuple.hxx>
55
#include <ROOT/RNTupleModel.hxx>
6+
#include <ROOT/RVersion.hxx>
67
#include <RVersion.h>
78
#include <stdint.h>
8-
#include <ROOT/RVersion.hxx>
99

10+
#include "TFile.h"
1011
#include "podio/CollectionBase.h"
1112
#include "podio/Frame.h"
1213
#include "podio/GenericParameters.h"
1314
#include "podio/SchemaEvolution.h"
1415
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
15-
#include "TFile.h"
1616

1717
namespace ROOT {
1818
namespace Experimental {
19-
class REntry;
20-
} // namespace Experimental
21-
} // namespace ROOT
19+
class REntry;
20+
} // namespace Experimental
21+
} // namespace ROOT
2222
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
2323
#include <ROOT/RNTupleWriter.hxx>
2424
#endif
2525

26-
#include <string>
27-
#include <unordered_map>
28-
#include <vector>
2926
#include <memory>
27+
#include <string>
3028
#include <tuple>
29+
#include <unordered_map>
3130
#include <utility>
31+
#include <vector>
3232

3333
namespace podio {
3434
class Frame;

‎include/podio/ROOTReader.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
#ifndef PODIO_ROOTREADER_H
22
#define PODIO_ROOTREADER_H
33

4-
#include <stddef.h>
54
#include <memory>
5+
#include <stddef.h>
66
#include <string>
77
#include <string_view>
88
#include <tuple>
9+
#include <unordered_map>
910
#include <utility>
1011
#include <vector>
11-
#include <unordered_map>
1212

13+
#include "TChain.h"
1314
#include "podio/CollectionBranches.h"
1415
#include "podio/ROOTFrameData.h"
16+
#include "podio/SchemaEvolution.h"
1517
#include "podio/podioVersion.h"
1618
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
17-
#include "TChain.h"
18-
#include "podio/SchemaEvolution.h"
1919

2020
// forward declarations
2121
class TClass;

‎include/podio/ROOTWriter.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#ifndef PODIO_ROOTWRITER_H
22
#define PODIO_ROOTWRITER_H
33

4-
#include <stdint.h>
54
#include <memory>
5+
#include <stdint.h>
66
#include <string>
77
#include <tuple>
88
#include <unordered_map>
9-
#include <vector>
109
#include <utility>
10+
#include <vector>
1111

12+
#include "TFile.h"
1213
#include "podio/CollectionBranches.h"
1314
#include "podio/CollectionIDTable.h"
1415
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
15-
#include "TFile.h"
1616

1717
// forward declarations
1818
class TTree;

‎include/podio/SIOBlock.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
#ifndef PODIO_SIOBLOCK_H
22
#define PODIO_SIOBLOCK_H
33

4+
#include <functional>
5+
#include <map>
6+
#include <memory>
47
#include <podio/CollectionBase.h>
58
#include <podio/CollectionIDTable.h>
69
#include <podio/GenericParameters.h>
710
#include <podio/podioVersion.h>
811
#include <podio/utilities/TypeHelpers.h>
912
#include <sio/block.h>
13+
#include <sio/definitions.h>
1014
#include <sio/io_device.h>
1115
#include <sio/version.h>
12-
#include <sio/definitions.h>
1316
#include <stddef.h>
1417
#include <stdint.h>
15-
#include <map>
16-
#include <memory>
1718
#include <string>
1819
#include <string_view>
1920
#include <tuple>
20-
#include <vector>
21-
#include <functional>
2221
#include <unordered_map>
2322
#include <utility>
23+
#include <vector>
2424

2525
#include "podio/CollectionBuffers.h"
2626

‎include/podio/SIOBlockUserData.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#ifndef PODIO_SIOBLOCKUSERDATA_H
22
#define PODIO_SIOBLOCKUSERDATA_H
33

4+
#include <algorithm>
45
#include <sio/api.h>
6+
#include <sio/definitions.h>
57
#include <sio/io_device.h>
68
#include <sio/version.h>
7-
#include <sio/definitions.h>
8-
#include <algorithm>
99
#include <string>
1010
#include <typeindex>
1111
#include <vector>

‎include/podio/SIOFrameData.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#ifndef PODIO_SIOFRAMEDATA_H
22
#define PODIO_SIOFRAMEDATA_H
33

4-
#include <sio/buffer.h>
5-
#include <sio/definitions.h>
4+
#include <cstddef>
65
#include <memory>
76
#include <numeric>
87
#include <optional>
8+
#include <sio/buffer.h>
9+
#include <sio/definitions.h>
910
#include <string>
10-
#include <vector>
11-
#include <cstddef>
1211
#include <utility>
12+
#include <vector>
1313

1414
#include "podio/CollectionBuffers.h"
1515
#include "podio/CollectionIDTable.h"

‎include/podio/SIOLegacyReader.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#ifndef PODIO_SIOLEGACYREADER_H
22
#define PODIO_SIOLEGACYREADER_H
33

4-
#include <sio/definitions.h>
5-
#include <sio/buffer.h>
4+
#include <fstream>
65
#include <memory>
6+
#include <sio/buffer.h>
7+
#include <sio/definitions.h>
8+
#include <string>
79
#include <string_view>
810
#include <vector>
9-
#include <fstream>
10-
#include <string>
1111

1212
#include "podio/SIOBlock.h"
1313
#include "podio/SIOFrameData.h"

‎include/podio/SIOReader.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#ifndef PODIO_SIOREADER_H
22
#define PODIO_SIOREADER_H
33

4-
#include <sio/definitions.h>
4+
#include <fstream>
55
#include <memory>
6+
#include <sio/definitions.h>
67
#include <string>
78
#include <string_view>
89
#include <unordered_map>
9-
#include <fstream>
1010
#include <vector>
1111

1212
#include "podio/SIOBlock.h"

‎include/podio/SIOWriter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#ifndef PODIO_SIOWRITER_H
22
#define PODIO_SIOWRITER_H
33

4+
#include <fstream>
45
#include <sio/definitions.h>
56
#include <string>
67
#include <utility>
78
#include <vector>
8-
#include <fstream>
99

1010
#include "podio/SIOBlock.h"
1111
#include "podio/utilities/DatamodelRegistryIOHelpers.h"

‎include/podio/SchemaEvolution.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef PODIO_SCHEMAEVOLUTION_H
22
#define PODIO_SCHEMAEVOLUTION_H
33

4-
#include <stddef.h>
54
#include <cstdint>
65
#include <functional>
6+
#include <stddef.h>
77
#include <string>
88
#include <unordered_map>
99
#include <vector>

‎include/podio/UserDataCollection.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#ifndef PODIO_USERDATACOLLECTION_H
22
#define PODIO_USERDATACOLLECTION_H
33

4+
#include <iostream>
45
#include <stddef.h>
56
#include <stdint.h>
67
#include <string_view>
8+
#include <tuple>
79
#include <type_traits>
810
#include <utility>
911
#include <vector>
10-
#include <iostream>
11-
#include <tuple>
1212

1313
#include "podio/CollectionBase.h"
1414
#include "podio/CollectionBuffers.h"
@@ -18,7 +18,7 @@
1818

1919
namespace podio {
2020
class ICollectionProvider;
21-
} // namespace podio
21+
} // namespace podio
2222

2323
#define PODIO_ADD_USER_TYPE(type) \
2424
template <> \

‎podioVersion.in.h

+6-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#define PODIO_PODIOVERSION_H
33

44
#include <cstdint>
5-
#include <sstream>
65
#include <ostream>
6+
#include <sstream>
77
#include <tuple>
88
#if __cplusplus >= 202002L
99
#include <compare>
@@ -13,8 +13,7 @@
1313
// necessary
1414

1515
/// Define a version to be used in podio.
16-
#define PODIO_VERSION(major, minor, patch) \
17-
((UINT64_C(major) << 32) | (UINT64_C(minor) << 16) | UINT64_C(patch))
16+
#define PODIO_VERSION(major, minor, patch) ((UINT64_C(major) << 32) | (UINT64_C(minor) << 16) | UINT64_C(patch))
1817
/// Get the major version from a preprocessor defined version
1918
#define PODIO_MAJOR_VERSION(v) (((v) & (-1UL >> 16)) >> 32)
2019
/// Get the minor version from a preprocessor defined version
@@ -23,9 +22,9 @@
2322
#define PODIO_PATCH_VERSION(v) ((v) & (-1UL >> 48))
2423

2524
// Some helper constants that are populated by the cmake configure step
26-
#define podio_VERSION_MAJOR @podio_VERSION_MAJOR@
27-
#define podio_VERSION_MINOR @podio_VERSION_MINOR@
28-
#define podio_VERSION_PATCH @podio_VERSION_PATCH@
25+
#define podio_VERSION_MAJOR @podio_VERSION_MAJOR @
26+
#define podio_VERSION_MINOR @podio_VERSION_MINOR @
27+
#define podio_VERSION_PATCH @podio_VERSION_PATCH @
2928
#define podio_VERSION PODIO_VERSION(podio_VERSION_MAJOR, podio_VERSION_MINOR, podio_VERSION_PATCH)
3029

3130
/// The encoded version with which podio has been built
@@ -42,7 +41,7 @@ struct Version {
4241
uint16_t patch{0};
4342

4443
#if __cplusplus >= 202002L
45-
auto operator<=>(const Version&) const = default;
44+
auto operator<= > (const Version&) const = default;
4645
#else
4746
// No spaceship yet in c++17
4847
#define DEFINE_COMP_OPERATOR(OP) \

‎src/CollectionIDTable.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// podio specific includes
22
#include "podio/CollectionIDTable.h"
33

4-
#include <stddef.h>
54
#include <algorithm>
65
#include <iostream>
76
#include <iterator>
7+
#include <stddef.h>
88
#include <utility>
99

1010
#include "MurmurHash3.h"

‎src/RNTupleReader.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#include "podio/RNTupleReader.h"
22

3-
#include <ROOT/RError.hxx>
4-
#include <stddef.h>
5-
#include <stdint.h>
63
#include <ROOT/REntry.hxx>
4+
#include <ROOT/RError.hxx>
75
#include <ROOT/RNTupleModel.hxx>
86
#include <ROOT/RNTupleView.hxx>
9-
#include <memory>
107
#include <algorithm>
118
#include <format>
129
#include <iostream>
10+
#include <memory>
1311
#include <numeric>
1412
#include <optional>
13+
#include <stddef.h>
14+
#include <stdint.h>
1515
#include <tuple>
1616
#include <utility>
1717

@@ -20,8 +20,8 @@
2020
#include "podio/CollectionIDTable.h"
2121
#include "podio/DatamodelRegistry.h"
2222
#include "podio/GenericParameters.h"
23-
#include "rootUtils.h"
2423
#include "podio/ObjectID.h"
24+
#include "rootUtils.h"
2525

2626
namespace podio {
2727

0 commit comments

Comments
 (0)