diff options
| author | Nikos Nikoleris <nikos.nikoleris@arm.com> | 2016-05-26 11:56:24 +0100 |
|---|---|---|
| committer | Nikos Nikoleris <nikos.nikoleris@arm.com> | 2016-05-26 11:56:24 +0100 |
| commit | d68f3577d6183de7dcadc1cfbfe53444e83989de (patch) | |
| tree | 4bacf524b307b385a74b237c0a2de0b0234908cc /src/mem/cache/mshr.cc | |
| parent | 90bf50b4c7249a4f5529245a82bc59370de468bd (diff) | |
| download | gem5-d68f3577d6183de7dcadc1cfbfe53444e83989de.tar.xz | |
mem: change NULL to nullptr in the cache related classes
Change-Id: I5042410be54935650b7d05c84d8d9efbfcc06e70
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/mem/cache/mshr.cc')
| -rw-r--r-- | src/mem/cache/mshr.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc index 14f381e91..5c4481e02 100644 --- a/src/mem/cache/mshr.cc +++ b/src/mem/cache/mshr.cc @@ -95,7 +95,7 @@ MSHR::TargetList::add(PacketPtr pkt, Tick readyTime, // an MSHR entry. If we do, set the downstreamPending // flag. Otherwise, do nothing. MSHR *mshr = pkt->findNextSenderState<MSHR>(); - if (mshr != NULL) { + if (mshr != nullptr) { assert(!mshr->downstreamPending); mshr->downstreamPending = true; } else { @@ -166,7 +166,7 @@ MSHR::TargetList::clearDownstreamPending() // downstreamPending flag in all caches this packet has // passed through. MSHR *mshr = t.pkt->findNextSenderState<MSHR>(); - if (mshr != NULL) { + if (mshr != nullptr) { mshr->clearDownstreamPending(); } } @@ -491,7 +491,7 @@ MSHR::checkFunctional(PacketPtr pkt) // For other requests, we iterate over the individual targets // since that's where the actual data lies. if (pkt->isPrint()) { - pkt->checkFunctional(this, blkAddr, isSecure, blkSize, NULL); + pkt->checkFunctional(this, blkAddr, isSecure, blkSize, nullptr); return false; } else { return (targets.checkFunctional(pkt) || |