Skip to content

Commit 084f52f

Browse files
committed
Merge #11654: tests: Initialize recently introduced non-static class member lastCycles to zero in constructor
069215e Initialize recently introduced non-static class member lastCycles to zero in constructor (practicalswift) Pull request description: Initialize recently introduced non-static class member `lastCycles` to zero in constructor. `lastCycles` was introduced in 3532818 which was merged into master yesterday. Friendly ping @laanwj :-) Tree-SHA512: cb93b6a8f6e2e3b06cd05a635da95c84f3df64c21fc23fe82f98306ea571badc32040315b563e46ddb5203128226bc334269acd497beead5a5777c434060fd85
2 parents 66d46c7 + 069215e commit 084f52f

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/bench/bench.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,17 @@ namespace benchmark {
5959
uint64_t minCycles;
6060
uint64_t maxCycles;
6161
public:
62-
State(std::string _name, duration _maxElapsed) : name(_name), maxElapsed(_maxElapsed), count(0) {
63-
minTime = duration::max();
64-
maxTime = duration::zero();
65-
minCycles = std::numeric_limits<uint64_t>::max();
66-
maxCycles = std::numeric_limits<uint64_t>::min();
67-
countMask = 1;
62+
State(std::string _name, duration _maxElapsed) :
63+
name(_name),
64+
maxElapsed(_maxElapsed),
65+
minTime(duration::max()),
66+
maxTime(duration::zero()),
67+
count(0),
68+
countMask(1),
69+
beginCycles(0),
70+
lastCycles(0),
71+
minCycles(std::numeric_limits<uint64_t>::max()),
72+
maxCycles(std::numeric_limits<uint64_t>::min()) {
6873
}
6974
bool KeepRunning();
7075
};

0 commit comments

Comments
 (0)