From 108b9084ade8b0ffa3ddb5897db1c861b6033fc1 Mon Sep 17 00:00:00 2001 From: Timothy Canham Date: Thu, 26 Sep 2024 07:47:20 -0700 Subject: [PATCH] Fixed NULL to nullptr --- Svc/DpCatalog/test/ut/DpCatalogTester.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Svc/DpCatalog/test/ut/DpCatalogTester.cpp b/Svc/DpCatalog/test/ut/DpCatalogTester.cpp index fb306e7b09..ea5665f5e1 100644 --- a/Svc/DpCatalog/test/ut/DpCatalogTester.cpp +++ b/Svc/DpCatalog/test/ut/DpCatalogTester.cpp @@ -53,8 +53,8 @@ namespace Svc { DpCatalog::DpStateEntry* input, DpCatalog::DpStateEntry* output, NATIVE_INT_TYPE numEntries) { - ASSERT_TRUE(input != NULL); - ASSERT_TRUE(output != NULL); + ASSERT_TRUE(input != nullptr); + ASSERT_TRUE(output != nullptr); ASSERT_TRUE(numEntries > 0); Fw::MallocAllocator alloc; @@ -81,15 +81,15 @@ namespace Svc { DpCatalog::DpBtreeNode* res = this->component.findNextTreeNode(); if (entry == numEntries) { // final request should indicate empty - ASSERT_TRUE(res == NULL); + ASSERT_TRUE(res == nullptr); break; } else if (output[entry].record.getstate() == Fw::DpState::TRANSMITTED) { // if transmitted, should not be returned - ASSERT_TRUE(res == NULL); + ASSERT_TRUE(res == nullptr); // continue to next entry continue; } else { - ASSERT_TRUE(res != NULL); + ASSERT_TRUE(res != nullptr); } // should match expected entry ASSERT_EQ(res->entry.record,output[entry].record);