Skip to content

Commit cb68946

Browse files
committed
[ntuple] RNTupleUtil.hxx --> RNTupleTypes.hxx
Split ROOT/RNTupleUtil.hxx in ROOT/RNTupleUtils.hxx (plural) containing only utility functions. The rest of ROOT/RNTupleUtil.hxx goes into ROOT/RNTupleTypes.hxx. This makes the header(s) more consistent with other ROOT components.
1 parent 17c1363 commit cb68946

Some content is hidden

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

59 files changed

+140
-96
lines changed

tree/dataframe/inc/ROOT/RNTupleDS.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#define ROOT_RNTupleDS
1919

2020
#include <ROOT/RDataSource.hxx>
21-
#include <ROOT/RNTupleUtil.hxx>
2221
#include <ROOT/RNTupleDescriptor.hxx>
22+
#include <ROOT/RNTupleTypes.hxx>
2323
#include <string_view>
2424

2525
#include <condition_variable>

tree/dataframe/src/RNTupleDS.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <ROOT/RPageStorageFile.hxx>
2020
#include <ROOT/RNTupleDescriptor.hxx>
2121
#include <ROOT/RNTupleDS.hxx>
22-
#include <ROOT/RNTupleUtil.hxx>
22+
#include <ROOT/RNTupleTypes.hxx>
2323
#include <ROOT/RPageStorage.hxx>
2424
#include <string_view>
2525

tree/ntuple/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ HEADERS
3737
ROOT/RNTupleReadOptions.hxx
3838
ROOT/RNTupleReader.hxx
3939
ROOT/RNTupleSerialize.hxx
40-
ROOT/RNTupleUtil.hxx
40+
ROOT/RNTupleTypes.hxx
41+
ROOT/RNTupleUtils.hxx
4142
ROOT/RNTupleView.hxx
4243
ROOT/RNTupleWriteOptions.hxx
4344
ROOT/RNTupleWriteOptionsDaos.hxx
@@ -75,7 +76,7 @@ SOURCES
7576
src/RNTupleProcessor.cxx
7677
src/RNTupleReader.cxx
7778
src/RNTupleSerialize.cxx
78-
src/RNTupleUtil.cxx
79+
src/RNTupleUtils.cxx
7980
src/RNTupleWriteOptions.cxx
8081
src/RNTupleWriter.cxx
8182
src/RNTupleView.cxx

tree/ntuple/inc/ROOT/RCluster.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef ROOT_RCluster
1717
#define ROOT_RCluster
1818

19-
#include <ROOT/RNTupleUtil.hxx>
19+
#include <ROOT/RNTupleTypes.hxx>
2020

2121
#include <cstdint>
2222
#include <memory>

tree/ntuple/inc/ROOT/RClusterPool.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define ROOT_RClusterPool
1818

1919
#include <ROOT/RCluster.hxx>
20-
#include <ROOT/RNTupleUtil.hxx>
20+
#include <ROOT/RNTupleTypes.hxx>
2121

2222
#include <condition_variable>
2323
#include <deque>

tree/ntuple/inc/ROOT/RColumn.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <ROOT/RConfig.hxx> // for R__likely
1818
#include <ROOT/RColumnElementBase.hxx>
19-
#include <ROOT/RNTupleUtil.hxx>
19+
#include <ROOT/RNTupleTypes.hxx>
2020
#include <ROOT/RPage.hxx>
2121
#include <ROOT/RPageStorage.hxx>
2222

tree/ntuple/inc/ROOT/RColumnElementBase.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "RtypesCore.h"
1818
#include <ROOT/RError.hxx>
1919
#include <ROOT/RFloat16.hxx>
20-
#include <ROOT/RNTupleUtil.hxx>
20+
#include <ROOT/RNTupleTypes.hxx>
2121

2222
#include <Byteswap.h>
2323
#include <TError.h>

tree/ntuple/inc/ROOT/RField.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <ROOT/RFieldBase.hxx>
1919
#include <ROOT/RFieldUtils.hxx>
2020
#include <ROOT/RNTupleSerialize.hxx>
21-
#include <ROOT/RNTupleUtil.hxx>
21+
#include <ROOT/RNTupleTypes.hxx>
2222
#include <ROOT/RSpan.hxx>
2323
#include <string_view>
2424
#include <ROOT/TypeTraits.hxx>

tree/ntuple/inc/ROOT/RField/RFieldFundamental.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include <ROOT/RColumn.hxx>
2222
#include <ROOT/RFieldBase.hxx>
23-
#include <ROOT/RNTupleUtil.hxx>
23+
#include <ROOT/RNTupleTypes.hxx>
2424

2525
#include <cstddef>
2626
#include <memory>

tree/ntuple/inc/ROOT/RField/RFieldProxiedCollection.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#endif
2020

2121
#include <ROOT/RFieldBase.hxx>
22-
#include <ROOT/RNTupleUtil.hxx>
22+
#include <ROOT/RNTupleTypes.hxx>
2323

2424
#include <TVirtualCollectionProxy.h>
2525

0 commit comments

Comments
 (0)