Skip to content

Commit 3adbde5

Browse files
clang changes
Signed-off-by: AdityaPandeyCN <adityapand3y666@gmail.com>
1 parent 746dac1 commit 3adbde5

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

src/ramcore/RAMNTupleView.cxx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <cstdint>
44
#include <cstring>
55
#include <iostream>
6-
#include <limits>
6+
#include <limits> // NOLINT(misc-include-cleaner)
77
#include <string>
88

99
#include <ROOT/RNTuple.hxx>
@@ -182,3 +182,4 @@ Long64_t ramntupleview(const char *file, const char *query, bool cache, bool per
182182
std::cout << "Found " << static_cast<long long>(count) << " records in region " << (query ? query : "") << std::endl;
183183
return count;
184184
}
185+

src/ramcore/SamToNTuple.cxx

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
#include "ramcore/SamParser.h"
33
#include "rntuple/RAMNTupleRecord.h"
44

5+
#include <cstdint>
6+
#include <map>
7+
#include <memory>
8+
#include <cstdio>
9+
#include <thread>
10+
#include <vector>
11+
#include <mutex>
12+
#include <algorithm>
13+
#include <unordered_set>
14+
515
#include <ROOT/RNTupleModel.hxx>
616
#include <ROOT/RNTupleWriter.hxx>
717
#include <ROOT/RNTupleWriteOptions.hxx>
@@ -13,16 +23,6 @@
1323
#include <TFile.h>
1424
#include <TROOT.h>
1525

16-
#include <cstdint>
17-
#include <map>
18-
#include <memory>
19-
#include <cstdio>
20-
#include <thread>
21-
#include <vector>
22-
#include <mutex>
23-
#include <algorithm>
24-
#include <unordered_set>
25-
2626
void samtoramntuple(const char *datafile,
2727
const char *treefile,
2828
bool index, bool split, bool cache,
@@ -301,3 +301,4 @@ void samtoramntuple_split_by_chromosome(const char *datafile, const char *output
301301
}
302302
}
303303
}
304+

test/ramcoretests.cxx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <cstdio>
1010
#include <cstdlib>
1111
#include <filesystem>
12+
#include <string>
1213

1314
#include "../tools/ramview.cxx"
1415

@@ -55,14 +56,17 @@ TEST_F(ramcoreTest, ConversionProducesEqualEntries) {
5556
const char *region = "chrM:1-100000000";
5657

5758
testing::internal::CaptureStdout();
58-
ramview(ttreeFile, region, /*cache=*/true, /*perfstats=*/false, nullptr);
59-
std::string ramview_output = testing::internal::GetCapturedStdout();
59+
ramview(ttreeFile, region, /*cache=*/true, /*perfstats=*/false, /*perfstatsfilename=*/nullptr);
60+
std::string ramview_output;
61+
ramview_output = testing::internal::GetCapturedStdout();
6062

6163
testing::internal::CaptureStdout();
62-
ramntupleview(rntupleFile, region, /*cache=*/true, /*perfstats=*/false, nullptr);
63-
std::string ramntupleview_output = testing::internal::GetCapturedStdout();
64+
ramntupleview(rntupleFile, region, /*cache=*/true, /*perfstats=*/false, /*perfstatsfilename=*/nullptr);
65+
std::string ramntupleview_output;
66+
ramntupleview_output = testing::internal::GetCapturedStdout();
6467

6568
EXPECT_TRUE(ramview_output.find("Found") != std::string::npos);
6669
EXPECT_TRUE(ramntupleview_output.find("Found") != std::string::npos);
6770
EXPECT_TRUE(ramntupleview_output.find("records in region") != std::string::npos);
6871
}
72+

tools/samtoramntuple.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ int main(int argc, char* argv[]) {
3131
do_split = true;
3232
} else if (arg == "-only") {
3333
if (i + 1 < argc) {
34+
3435
only_chromosomes.emplace_back(argv[++i]);
3536
} else {
3637
std::cerr << "-only expects a chromosome name\n";

0 commit comments

Comments
 (0)