diff options
Diffstat (limited to 'src/mongo/unittest')
| -rw-r--r-- | src/mongo/unittest/system_resource_canary_bm.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/unittest/unittest.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/unittest/system_resource_canary_bm.cpp b/src/mongo/unittest/system_resource_canary_bm.cpp index beaba9aa585..f2f09bc162b 100644 --- a/src/mongo/unittest/system_resource_canary_bm.cpp +++ b/src/mongo/unittest/system_resource_canary_bm.cpp @@ -137,7 +137,7 @@ BENCHMARK_DEFINE_F(CacheLatencyTest, BM_CacheLatency)(benchmark::State& state) { size_t counter = arrLength / (kStrideBytes * 100) + 1; for (auto keepRunning : state) { - char** dummyResult = 0; // Dummy result to prevent the loop from being optimized out. + char** dummyResult = nullptr; // Dummy result to prevent the loop from being optimized out. char** ptrToNextLinkedListNode = reinterpret_cast<char**>(data.get()[0]); for (size_t i = 0; i < counter; ++i) { diff --git a/src/mongo/unittest/unittest.cpp b/src/mongo/unittest/unittest.cpp index 764be0908d0..3cce9bf868d 100644 --- a/src/mongo/unittest/unittest.cpp +++ b/src/mongo/unittest/unittest.cpp @@ -138,7 +138,7 @@ public: static Result* cur; }; -Result* Result::cur = 0; +Result* Result::cur = nullptr; namespace { @@ -390,7 +390,7 @@ int Suite::run(const std::vector<std::string>& suites, const std::string& filter for (std::string name : torun) { std::shared_ptr<Suite>& s = _allSuites()[name]; - fassert(16145, s != NULL); + fassert(16145, s != nullptr); log() << "going to run suite: " << name << std::endl; results.emplace_back(s->run(filter, runsPerTest)); @@ -407,7 +407,7 @@ int Suite::run(const std::vector<std::string>& suites, const std::string& filter Result totals("TOTALS"); std::vector<std::string> failedSuites; - Result::cur = NULL; + Result::cur = nullptr; for (const auto& r : results) { log().setIsTruncatable(false) << r->toString(); if (abs(r->rc()) > abs(rc)) |