Skip to content

Commit 8ddd50c

Browse files
committed
Misc
1 parent f0ac23e commit 8ddd50c

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

src/jrd/recsrc/RecordSource.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,7 +1592,7 @@ namespace Jrd
15921592
UNLIST_INDEX_LAST = 2
15931593
};
15941594

1595-
struct Impure : public TableValueFunctionScan::Impure
1595+
struct Impure final : public TableValueFunctionScan::Impure
15961596
{
15971597
blb* m_blob;
15981598
Firebird::string* m_separatorStr;
@@ -1606,8 +1606,7 @@ namespace Jrd
16061606
protected:
16071607
void close(thread_db* tdbb) const final;
16081608
void internalOpen(thread_db* tdbb) const final;
1609-
void internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, unsigned level,
1610-
bool recurse) const final;
1609+
void internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, unsigned level, bool recurse) const final;
16111610

16121611
bool nextBuffer(thread_db* tdbb) const final;
16131612

@@ -1625,7 +1624,7 @@ namespace Jrd
16251624
GEN_SERIES_INDEX_LAST = 3
16261625
};
16271626

1628-
struct Impure : public TableValueFunctionScan::Impure
1627+
struct Impure final : public TableValueFunctionScan::Impure
16291628
{
16301629
union
16311630
{
@@ -1662,8 +1661,7 @@ namespace Jrd
16621661
protected:
16631662
void close(thread_db* tdbb) const override;
16641663
void internalOpen(thread_db* tdbb) const override;
1665-
void internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, unsigned level,
1666-
bool recurse) const override;
1664+
void internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, unsigned level, bool recurse) const override;
16671665
bool internalGetRecord(thread_db* tdbb) const override;
16681666

16691667
bool nextBuffer(thread_db* tdbb) const override;

src/jrd/recsrc/TableValueFunctionScan.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ void GenSeriesFunctionScan::internalOpen(thread_db* tdbb) const
412412
// common type
413413
impure->m_dtype = MAX(MAX(startDesc->dsc_dtype, finishDesc->dsc_dtype), stepDesc->dsc_dtype);
414414

415-
if (impure->m_dtype != dtype_int128)
415+
if (impure->m_dtype != dtype_int128)
416416
{
417417
const auto start = MOV_get_int64(tdbb, startDesc, impure->m_scale);
418418
const auto finish = MOV_get_int64(tdbb, finishDesc, impure->m_scale);
@@ -433,7 +433,7 @@ void GenSeriesFunctionScan::internalOpen(thread_db* tdbb) const
433433
impure->m_step.vlu_int64 = step;
434434
impure->m_result.vlu_int64 = start;
435435
}
436-
else
436+
else
437437
{
438438
const auto start = MOV_get_int128(tdbb, startDesc, impure->m_scale);
439439
const auto finish = MOV_get_int128(tdbb, finishDesc, impure->m_scale);
@@ -456,7 +456,7 @@ void GenSeriesFunctionScan::internalOpen(thread_db* tdbb) const
456456
}
457457

458458
impure->irsb_flags |= irsb_open;
459-
459+
460460
VIO_record(tdbb, rpb, m_format, &pool);
461461
}
462462

@@ -490,7 +490,7 @@ bool GenSeriesFunctionScan::internalGetRecord(thread_db* tdbb) const
490490

491491
rpb->rpb_number.increment();
492492

493-
if (nextBuffer(tdbb))
493+
if (nextBuffer(tdbb))
494494
{
495495
rpb->rpb_number.setValid(true);
496496
return true;
@@ -528,7 +528,8 @@ bool GenSeriesFunctionScan::nextBuffer(thread_db* tdbb) const
528528
return true;
529529
}
530530
}
531-
else {
531+
else
532+
{
532533
auto result = impure->m_result.vlu_int128;
533534
const auto finish = impure->m_finish.vlu_int128;
534535
const auto step = impure->m_step.vlu_int128;

0 commit comments

Comments
 (0)