Skip to content

Commit 2a84b70

Browse files
committed
Replace NULL to nullptr
1 parent 59ab8d5 commit 2a84b70

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/jrd/TempSpace.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ offset_t TempSpace::allocateSpace(FB_SIZE_T size)
476476
{
477477
// Find the best available space. This is defined as the smallest free space
478478
// that is big enough. This preserves large blocks.
479-
Segment* best = NULL;
479+
Segment* best = nullptr;
480480

481481
// Search through the available space in the not used segments list
482482
if (freeSegmentLastPointers.locate(locGreatEqual, size))

src/jrd/TempSpace.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class TempSpace : public Firebird::File
183183
{
184184
public:
185185
Segment(offset_t aPosition, offset_t aSize) :
186-
position(aPosition), size(aSize), prev(NULL), next(NULL)
186+
position(aPosition), size(aSize), prev(nullptr), next(nullptr)
187187
{}
188188

189189
offset_t position;
@@ -200,7 +200,7 @@ class TempSpace : public Firebird::File
200200
class SegmentLastPointer
201201
{
202202
public:
203-
SegmentLastPointer() : size(0), last(NULL)
203+
SegmentLastPointer() : size(0), last(nullptr)
204204
{}
205205

206206
SegmentLastPointer(offset_t aSize, Segment* aSegment) :
@@ -251,30 +251,30 @@ class TempSpace : public Firebird::File
251251
if (freeSegmentLastPointers.locate(segment->size))
252252
{
253253
SegmentLastPointer* const pointer = &freeSegmentLastPointers.current();
254-
segment->next = NULL;
254+
segment->next = nullptr;
255255
segment->prev = pointer->last;
256256
pointer->last->next = segment;
257257
pointer->last = segment;
258258
}
259259
else
260260
{
261-
segment->prev = NULL;
262-
segment->next = NULL;
261+
segment->prev = nullptr;
262+
segment->next = nullptr;
263263
freeSegmentLastPointers.add(SegmentLastPointer(segment->size, segment));
264264
}
265265
}
266266

267267
inline void lastPointerRemove(Segment* const segment)
268268
{
269-
if (segment->next == NULL)
269+
if (segment->next == nullptr)
270270
{
271271
if (!freeSegmentLastPointers.locate(segment->size))
272272
fb_assert(false);
273273

274274
SegmentLastPointer* pointer = &freeSegmentLastPointers.current();
275275
if (segment->prev)
276276
{
277-
segment->prev->next = NULL;
277+
segment->prev->next = nullptr;
278278
pointer->last = segment->prev;
279279
}
280280
else

0 commit comments

Comments
 (0)