Skip to content

Commit 4ff0b4a

Browse files
committed
[Trivial] NULL --> nullptr in skiplist_tests
1 parent b53a986 commit 4ff0b4a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/test/skiplist_tests.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE(skiplist_test)
2222

2323
for (int i=0; i<SKIPLIST_LENGTH; i++) {
2424
vIndex[i].nHeight = i;
25-
vIndex[i].pprev = (i == 0) ? NULL : &vIndex[i - 1];
25+
vIndex[i].pprev = (i == 0) ? nullptr : &vIndex[i - 1];
2626
vIndex[i].BuildSkip();
2727
}
2828

@@ -31,7 +31,7 @@ BOOST_AUTO_TEST_CASE(skiplist_test)
3131
BOOST_CHECK(vIndex[i].pskip == &vIndex[vIndex[i].pskip->nHeight]);
3232
BOOST_CHECK(vIndex[i].pskip->nHeight < i);
3333
} else {
34-
BOOST_CHECK(vIndex[i].pskip == NULL);
34+
BOOST_CHECK(vIndex[i].pskip == nullptr);
3535
}
3636
}
3737

@@ -53,11 +53,11 @@ BOOST_AUTO_TEST_CASE(getlocator_test)
5353
for (unsigned int i=0; i<vBlocksMain.size(); i++) {
5454
vHashMain[i] = i; // Set the hash equal to the height, so we can quickly check the distances.
5555
vBlocksMain[i].nHeight = i;
56-
vBlocksMain[i].pprev = i ? &vBlocksMain[i - 1] : NULL;
56+
vBlocksMain[i].pprev = i ? &vBlocksMain[i - 1] : nullptr;
5757
vBlocksMain[i].phashBlock = &vHashMain[i];
5858
vBlocksMain[i].BuildSkip();
5959
BOOST_CHECK_EQUAL((int)vBlocksMain[i].GetBlockHash().GetLow64(), vBlocksMain[i].nHeight);
60-
BOOST_CHECK(vBlocksMain[i].pprev == NULL || vBlocksMain[i].nHeight == vBlocksMain[i].pprev->nHeight + 1);
60+
BOOST_CHECK(vBlocksMain[i].pprev == nullptr || vBlocksMain[i].nHeight == vBlocksMain[i].pprev->nHeight + 1);
6161
}
6262

6363
// Build a branch that splits off at block 49999, 50000 blocks long.
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE(getlocator_test)
7070
vBlocksSide[i].phashBlock = &vHashSide[i];
7171
vBlocksSide[i].BuildSkip();
7272
BOOST_CHECK_EQUAL((int)vBlocksSide[i].GetBlockHash().GetLow64(), vBlocksSide[i].nHeight);
73-
BOOST_CHECK(vBlocksSide[i].pprev == NULL || vBlocksSide[i].nHeight == vBlocksSide[i].pprev->nHeight + 1);
73+
BOOST_CHECK(vBlocksSide[i].pprev == nullptr || vBlocksSide[i].nHeight == vBlocksSide[i].pprev->nHeight + 1);
7474
}
7575

7676
// Build a CChain for the main branch.
@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE(findearliestatleast_test)
108108
for (unsigned int i=0; i<vBlocksMain.size(); i++) {
109109
vHashMain[i] = ArithToUint256(i); // Set the hash equal to the height
110110
vBlocksMain[i].nHeight = i;
111-
vBlocksMain[i].pprev = i ? &vBlocksMain[i - 1] : NULL;
111+
vBlocksMain[i].pprev = i ? &vBlocksMain[i - 1] : nullptr;
112112
vBlocksMain[i].phashBlock = &vHashMain[i];
113113
vBlocksMain[i].BuildSkip();
114114
if (i < 10) {
@@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE(findearliestatleast_test)
140140
int64_t test_time = vBlocksMain[r].nTime;
141141
CBlockIndex *ret = chain.FindEarliestAtLeast(test_time);
142142
BOOST_CHECK(ret->nTimeMax >= test_time);
143-
BOOST_CHECK((ret->pprev==NULL) || ret->pprev->nTimeMax < test_time);
143+
BOOST_CHECK((ret->pprev==nullptr) || ret->pprev->nTimeMax < test_time);
144144
BOOST_CHECK(vBlocksMain[r].GetAncestor(ret->nHeight) == ret);
145145
}
146146
}

0 commit comments

Comments
 (0)