Skip to content

Commit 9406211

Browse files
ferdymercurydpiparo
authored andcommitted
[nfc] clang-format
1 parent cbebe24 commit 9406211

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

io/io/test/TFileMergerTests.cxx

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55
#include "TBranch.h"
66

77
#include "TMemFile.h"
8+
#include "TFile.h"
89
#include "TTree.h"
910
#include "TH1.h"
1011

12+
#include <memory>
13+
1114
static void CreateATuple(TMemFile &file, const char *name, double value)
1215
{
1316
auto mytree = new TTree(name, "A tree");
@@ -161,37 +164,30 @@ TEST(TFileMerger, MergeBranches)
161164
file3->Write();
162165
}
163166

164-
165-
#include <memory>
166-
#include <TFile.h>
167-
#include <TFileMerger.h>
168-
#include <TTree.h>
169-
170167
// https://github.com/root-project/root/issues/6640
171168
TEST(TFileMerger, ChangeFile)
172169
{
173170
{
174171
TFile f{"file6640mergerinput.root", "RECREATE"};
175-
172+
176173
TTree t{"T", "SetMaxTreeSize(1000)", 99, &f};
177174
int x;
178175
auto nentries = 20000;
179-
176+
180177
t.Branch("x", &x, "x/I");
181-
178+
182179
// Call function to forcedly trigger TTree::ChangeFile.
183180
// This will produce in total 3 files:
184181
// * file6640mergerinput.root
185182
// * file6640mergerinput_1.root
186183
// * file6640mergerinput_2.root
187184
TTree::SetMaxTreeSize(1000);
188-
189-
for (auto i = 0; i < nentries; i++)
190-
{
191-
x = i;
192-
t.Fill();
185+
186+
for (auto i = 0; i < nentries; i++) {
187+
x = i;
188+
t.Fill();
193189
}
194-
190+
195191
// Write last file to disk
196192
auto cf = t.GetCurrentFile();
197193
cf->Write();

tree/tree/src/TTree.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2791,7 +2791,7 @@ TFile* TTree::ChangeFile(TFile* file)
27912791
break;
27922792
}
27932793
++nus;
2794-
Warning("ChangeFile", "file %s already exists, trying with %d underscores", fname, nus+1);
2794+
Warning("ChangeFile", "file %s already exists, trying with %d underscores", fname, nus + 1);
27952795
}
27962796
Int_t compress = file->GetCompressionSettings();
27972797
TFile* newfile = TFile::Open(fname, "recreate", "chain files", compress);

0 commit comments

Comments
 (0)