Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unnecessary header includes #652

Merged
merged 4 commits into from
Aug 22, 2024
Merged

Remove unnecessary header includes #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3504279
Remove unnecessary headers
jmcarcell Aug 7, 2024
2052e7c
Fix pre-commit
jmcarcell Aug 7, 2024
d2e0ff1
Add back RNTuple.hxx
jmcarcell Aug 10, 2024
9e5769f
Fix order of includes
tmadlener Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions include/podio/CollectionBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
#define PODIO_COLLECTIONBASE_H

#include "podio/CollectionBuffers.h"
#include "podio/ObjectID.h"
#include "podio/SchemaEvolution.h"

#include <iostream>
#include <string_view>
#include <utility>
#include <vector>

namespace podio {
// forward declarations
Expand Down
1 change: 0 additions & 1 deletion include/podio/RNTupleReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <vector>

#include <ROOT/RNTuple.hxx>
#include <ROOT/RNTupleModel.hxx>
#include <RVersion.h>
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
#include <ROOT/RNTupleReader.hxx>
Expand Down
2 changes: 0 additions & 2 deletions include/podio/RNTupleWriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
#define PODIO_RNTUPLEWRITER_H

#include "podio/Frame.h"
#include "podio/GenericParameters.h"
#include "podio/SchemaEvolution.h"
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
#include "podio/utilities/RootHelpers.h"

#include "TFile.h"
#include <ROOT/RNTuple.hxx>
#include <ROOT/RNTupleModel.hxx>
#include <RVersion.h>
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
#include <ROOT/RNTupleWriter.hxx>
#endif
Expand Down
6 changes: 0 additions & 6 deletions include/podio/UserDataCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
#include "podio/SchemaEvolution.h"
#include "podio/utilities/TypeHelpers.h"

#include <map>
#include <string>
#include <typeindex>
#include <utility>
#include <vector>

#define PODIO_ADD_USER_TYPE(type) \
template <> \
constexpr const char* userDataTypeName<type>() { \
Expand Down
1 change: 0 additions & 1 deletion src/GenericParameters.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "podio/GenericParameters.h"

#include <algorithm>
#include <iomanip>

namespace podio {
Expand Down
1 change: 0 additions & 1 deletion src/RNTupleReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "podio/RNTupleReader.h"
#include "podio/CollectionBase.h"
#include "podio/CollectionBufferFactory.h"
#include "podio/CollectionBuffers.h"
#include "podio/CollectionIDTable.h"
Expand Down
5 changes: 0 additions & 5 deletions src/RNTupleWriter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
#include "podio/RNTupleWriter.h"
#include "podio/CollectionBase.h"
#include "podio/DatamodelRegistry.h"
#include "podio/GenericParameters.h"
#include "podio/SchemaEvolution.h"
#include "podio/podioVersion.h"
#include "rootUtils.h"

#include "TFile.h"

#include <ROOT/RField.hxx>
#include <ROOT/RNTuple.hxx>
#include <ROOT/RNTupleModel.hxx>

#include <algorithm>

namespace podio {

RNTupleWriter::RNTupleWriter(const std::string& filename) :
Expand Down
3 changes: 0 additions & 3 deletions src/ROOTLegacyReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
#include "TClass.h"
#include "TFile.h"
#include "TTree.h"
#include "TTreeCache.h"

#include <unordered_map>

namespace podio {

Expand Down
1 change: 0 additions & 1 deletion src/ROOTReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
// ROOT specific includes
#include "TChain.h"
#include "TClass.h"
#include "TTreeCache.h"

#include <stdexcept>
#include <unordered_map>
Expand Down
1 change: 0 additions & 1 deletion src/ROOTWriter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "podio/ROOTWriter.h"
#include "podio/CollectionBase.h"
#include "podio/DatamodelRegistry.h"
#include "podio/Frame.h"
#include "podio/GenericParameters.h"
Expand Down
1 change: 0 additions & 1 deletion src/SIOLegacyReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "podio/SIOLegacyReader.h"
#include "podio/SIOBlock.h"

#include "sioUtils.h"

Expand Down
1 change: 0 additions & 1 deletion src/SIOReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "podio/SIOReader.h"
#include "podio/SIOBlock.h"

#include "sioUtils.h"

Expand Down
3 changes: 0 additions & 3 deletions src/SIOWriter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#include "podio/SIOWriter.h"
#include "podio/CollectionBase.h"
#include "podio/CollectionIDTable.h"
#include "podio/Frame.h"
#include "podio/GenericParameters.h"
#include "podio/SIOBlock.h"

#include "sioUtils.h"
Expand Down
1 change: 0 additions & 1 deletion src/rootUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define PODIO_ROOT_UTILS_H // NOLINT(llvm-header-guard): internal headers confuse clang-tidy

#include "podio/CollectionIDTable.h"
#include "podio/GenericParameters.h"
#include "podio/utilities/RootHelpers.h"

#include "TBranch.h"
Expand Down
1 change: 0 additions & 1 deletion src/test_hashes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "MurmurHash3.h"

#include <algorithm>
#include <fstream>
#include <iomanip>
#include <iostream>
Expand Down
1 change: 0 additions & 1 deletion tests/unittests/buffer_factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "datamodel/DatamodelDefinition.h"
#include "datamodel/ExampleClusterCollection.h"
#include "datamodel/ExampleHitCollection.h"
#include "datamodel/ExampleWithVectorMemberCollection.h"

#include "catch2/catch_test_macros.hpp"
Expand Down
4 changes: 1 addition & 3 deletions tests/unittests/interface_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

#include "podio/ObjectID.h"

#include "datamodel/AnotherTypeWithEnergy.h"
#include "datamodel/EnergyInNamespaceCollection.h"
#include "datamodel/ExampleClusterCollection.h"
#include "datamodel/ExampleHitCollection.h"
#include "datamodel/MutableExampleCluster.h"
#include "datamodel/TypeWithEnergy.h"

#include <map>
Expand Down