Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Common/MathUtils/test/testUtils.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(Utils_test)
// dry run
sum = 0;
auto begin = std::chrono::high_resolution_clock::now();
for (int i = 0; i < iterations; ++i) {
for (size_t i = 0; i < iterations; ++i) {
for (int j = 0; j < M; ++j) {
sum += vx[j] + vy[j];
}
Expand All @@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE(Utils_test)
// double precision
double dsum = 0;
begin = std::chrono::high_resolution_clock::now();
for (int i = 0; i < iterations; ++i) {
for (size_t i = 0; i < iterations; ++i) {
for (int j = 0; j < M; ++j) {
dsum += std::atan2(vyd[j], vxd[j]);
}
Expand All @@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE(Utils_test)
// single precision
sum = 0;
begin = std::chrono::high_resolution_clock::now();
for (int i = 0; i < iterations; ++i) {
for (size_t i = 0; i < iterations; ++i) {
for (int j = 0; j < M; ++j) {
sum += atan2f(vy[j], vx[j]);
}
Expand All @@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE(Utils_test)
// fast method
sum = 0;
begin = std::chrono::high_resolution_clock::now();
for (int i = 0; i < iterations; ++i) {
for (size_t i = 0; i < iterations; ++i) {
for (int j = 0; j < M; ++j) {
sum += math_utils::fastATan2(vy[j], vx[j]);
}
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Headers/include/Headers/TimeStamp.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class TimeStamp
TimeStamp() = default;
TimeStamp(uint64_t ts) : mTimeStamp64(ts) {}
TimeStamp(const TimeUnitID& unit, uint32_t tick, uint16_t subtick = 0)
: mUnit(unit), mTicks(tick), mSubTicks(subtick) {}
: mUnit(unit), mSubTicks(subtick), mTicks(tick) {}
~TimeStamp() = default;

static TimeUnitID const sClockLHC;
Expand Down