Skip to content

Commit f61ed98

Browse files
committed
Fix compiler warnings due to hidden inherited virtual and release-unused variables.
1 parent 63e02de commit f61ed98

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2574,7 +2574,7 @@ class Dblqh
25742574
Uint32 returnExecLog(Signal* signal);
25752575
int saveAttrInfoInSection(const Uint32* dataPtr, Uint32 len);
25762576
void seizeAddfragrec(Signal* signal);
2577-
Uint32 seizeSegment();
2577+
Uint32 seizeSingleSegment();
25782578
Uint32 copyNextRange(Uint32 * dst, TcConnectionrec*);
25792579

25802580
void seizeFragmentrec(Signal* signal);

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10692,7 +10692,7 @@ Dblqh::seize_acc_ptr_list(ScanRecord* scanP,
1069210692
{
1069310693
for (Uint32 i = 1 + scanP->scan_acc_segments; i <= segments; i++)
1069410694
{
10695-
Uint32 seg= seizeSegment();
10695+
Uint32 seg= seizeSingleSegment();
1069610696
if (unlikely(seg == RNIL))
1069710697
{
1069810698
jam();
@@ -10722,7 +10722,7 @@ Dblqh::release_acc_ptr_list(ScanRecord* scanP)
1072210722
}
1072310723

1072410724
Uint32
10725-
Dblqh::seizeSegment()
10725+
Dblqh::seizeSingleSegment()
1072610726
{
1072710727
Uint32 junk= 0;
1072810728
Uint32 iVal= RNIL;

storage/ndb/src/kernel/vm/SegmentList.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,9 @@ LocalSegmentList::verify() const
417417
Uint32 offset = firstSeg->m_ownerRef;
418418
assert(sz >= offset);
419419
assert(offset < SectionSegment::DataLength);
420+
/* Suppress warnings in release */
421+
(void) sz;
422+
(void) offset;
420423
}
421424

422425
return true;

0 commit comments

Comments
 (0)